a
Merge branch 'master' of https://github.com/mrhack/web

Conflicts:
	css/style.css
	js/main.js