Nothing new, all the same 1.1a
All the same, but just a little worse
Merge branch 'master' of https://github.com/SunLight-Web/WCC

Conflicts:
	.DS_Store
	css/.DS_Store
	css/style.css
	img/bonus.png
	img/glyphicons-halflings-white.png
	img/glyphicons-halflings.png