Cleanup
Merge branch 'master' of github.com:EESoc/eesoc-website

Conflicts:
	bootstrap/start.sample.php