temp commit for pulling purposes
Merge branch 'master' of github.com:patrickf3139/bCal-Website

Conflicts:
	.gitignore