Initialization Done and Heroku setup
Merge branch 'master' of github.com:zubintt1/CollegeWebSite

Conflicts:
	.gitignore