update settings
Merge branch 'master' of github.com:mbatilando/collegeHackathon
merged settings
fix js
fix deadlines
fix deadlines
dynamically change college name
settings work
add files
Merge branch 'master' of github.com:mbatilando/collegeHackathon

Conflicts:
	assets/js/college.js