schedule styling idk..
Merge branch 'master' of https://github.com/tintho/bombafusion

Conflicts:
	css/main.css