Merge branch 'master' of https://github.com/SJBertsch/Team5Project

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