Merge branch 'master' into gh-pages
Merge pull request #13 from hfvw/gh-pages

Merge
Major website update
Merge branch 'master' of https://github.com/hfvw/FelisenumApp
Merge branch 'master' into gh-pages