Merge pull request #8 from b02197/master

pull
Merge pull request #9 from b02197/master

pull
added icons to the navbar
Merge pull request #10 from b02197/gh-pages

pull