This commit should not work
Merge branch 'master' of https://github.com/SJBertsch/Team5Project

Conflicts:
	Case_Compile2.cpp
	contacts.cpp
	contacts.h
	record.cpp
	record.h