Content changes for 20141029
Merge branch 'content' of https://github.com/vesterheim/vesterheim.github.io into content