another iupdate
Merge branch 'master' of github.com:skiingfox/Group_Project

Conflicts:
	.DS_Store