Merge branch 'master' of https://github.com/mcuringa/college-consultant

Conflicts:
	consultant/consultant/templates/base.html
	consultant/consultant/templates/home.html
changes from Erin
Merge branch 'master' of https://github.com/mcuringa/college-consultant

Conflicts:
	consultant/consultant/templates/base.html
	consultant/consultant/templates/home.html