Merge branch 'Team3-Working-branch'

Conflicts:
	GSP420CourseProject/GSP420CourseProject.sdf
	GSP420CourseProject/GSP420CourseProject.suo