2nd commit
Merge branch 'master' of https://github.com/jeremymcwilliams/my-study-abroad-project

Conflicts:
	index.php
trying this again