z
Merge branch 'master' of https://github.com/CIT275DevGroup/openTill

Conflicts:
	openTill/openTill.Persistence/POS_Initial.mdf
	openTill/openTill.Persistence/POS_Initial_log.ldf