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

Conflicts:
	openTill/openTill.Persistence/POS_Initial.mdf
	openTill/openTill.Persistence/POS_Initial_log.ldf
Added noScan.xaml file with numpad and data entry field
Merge branch 'master' of https://github.com/CIT275DevGroup/openTill.git
Added Cancel and Enter buttons to NoScan.xaml
Adjusted margins of NoScan.xaml
Numeric buttons should now add values to txtEntry in NoScan.xaml
Merge branch 'master'