Becky's updates
Merge branch 'content' of github.com:vesterheim/vesterheim.github.io into content