amir Done Monday10
Merge branch 'master' into BranchAmir

Conflicts:
	bin/memoryGame/Brick.class
	bin/memoryGame/Grid.class
	bin/memoryGame/LinasClass.class
	bin/memoryGame/cmdRunner.class
	bin/memoryGame/testGit.class
	src/memoryGame/Grid.java
	src/memoryGame/cmdRunner.java
Merge branch 'BranchAmir'