ok iMac
Merge branch 'master' of https://github.com/koke6645/SE452

Conflicts:
	DePaul-SE452-master/L2-persistence/sql/db/mydb.properties