Misc tidying/comments/etc
Misc tidying/comments/etc
Merge origin/master

Conflicts:
	src/memory/Game.java
	src/memory/models/Board.java