Merge branch 'master' of https://github.com/mattdye3/4261_GTMOB

Conflicts:
	.DS_Store
	source/.DS_Store