WIP
Merge branch 'master' of https://github.com/mayocat/mayocat.org

Conflicts:
	web/stylesheets/styles.css