Changes luisa
Merge branch 'master' of https://github.com/Zeon08/COP4655-Team-Project

Conflicts:
	COP4655_Team_Proj/COP4655_Team_Proj/WriteUpViewController.m