Merge branch 'master' of https://github.com/ovainola/JuliaFEM

README.md

@@ -1,4 +1,7 @@
 # JuliaFEM 
+
+[![Join the chat at https://gitter.im/JuliaFEM/JuliaFEM](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/JuliaFEM/JuliaFEM?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Build Status: [![Build Status](https://api.travis-ci.org/ovainola/JuliaFEM.svg?branch=master)](https://travis-ci.org/ovainola/JuliaFEM)
 
 Code Coverage: [![Coverage Status](https://coveralls.io/repos/ovainola/JuliaFEM/badge.svg?branch=master)](https://coveralls.io/r/ovainola/JuliaFEM?branch=master)

REQUIRE

@@ -2,3 +2,4 @@ julia 0.4-
 Logging
 LightXML
 Docile
+FactCheck

docs/doc.conf.py

@@ -0,0 +1,5 @@
+import juliadoc
+
+extensions = ['juliadoc.julia', 'juliadoc.jlhelp']
+html_theme_path = [juliadoc.get_theme_dir()]
+html_sidebars = juliadoc.default_sidebars()

docs/requirements.txt

@@ -0,0 +1 @@
+-e git+https://github.com/JuliaLang/JuliaDoc.git#egg=JuliaDoc