Post Hackership 4
Merge branch 'master' of https://github.com/juliendonck/hackership-repo

Conflicts:
	css/stylesheet.css