new
Merge branch 'master' of https://github.com/anellis/anellis.github.io

Conflicts:
index.html
stylesheet.css
changes