Merge conflict omg
Merge branch 'master' of https://github.com/mvthen/HackCooper

Conflicts:
	css/bootstrap.min.css