Integrate changes described by Simon
Merge branch 'master' of https://github.com/jessiedouglas/jessiedouglas.github.io
something