Merge branch 'master' of github.com:RedeNeural/PyCaxias2014
Merge branch 'master' into gh-pages