minor changes
Merge branch 'gh-pages' of https://github.com/gammelby/2014web into gh-pages