core logic with tests
Merge branch 'master' into js
basic movement
Merge branch 'master' into js
bugfixes
Merge branch 'js'

Conflicts:
	index.html
color fix
core logic with tests
basic movement
bugfixes
Merge branch 'js'

Conflicts:
	board.js
	index.html
	main.js