corrected typo
Merge branch 'master' into gh-pages
separate src and deployable code (issue #6)
separate src and deployable code (issue #6)
Merge branch 'master' into gh-pages