moti pull
pull
pull
Merge branch 'master' of https://github.com/motimonso/Ex05.git

Conflicts:
	Moti/App_Data/DB.mdf
	Moti/App_Data/DB_log.ldf