fixing it up for deployment
Merge branch 'master' of https://github.com/aregee/college_fest

Conflicts:
	README.md