Changes from 20141109
Merge branch 'content' of github.com:vesterheim/vesterheim.github.io into content