commented settings file
Merge branch 'master' of github.com:DanielKoohmarey/ThinkAhead

Conflicts:
	thinkahead/settings.py
Added function to generate a dictionary for colleges and major. Added 1 test for it