no message
Merge branches 'master' and 'master' of https://github.com/HaTTrick042/info343-ischool-capstone

Conflicts:
	.DS_Store