Requirement 1 & 2 Done
Version 1.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	out/production/Pos-Team7/com/PosTeam7/Main.class
Requirement 1 & 2 Done
Version 1.2