ooo
Merge branch 'master' of https://github.com/bolinat/bolinat.github.io

Conflicts:
	stylesheets/stylesheet.css