Fourth commit. Try to avoid conflicts.
Merge branch 'master' of https://github.com/groupG/FinalProject.git

Conflicts:
	FinalProject/Test