Board init
Test
Board edited
test
test commit
test
test
test
Merge branch 'master' of
https://github.com/koenigsberc/shiny-octo-lana.git

Conflicts:
	Memory/src/memory/Player.java