Polish
Merge branch 'master' into js
Swap row column css
basic movement
Merge branch 'master' into js
Kik stuff, css change
bugfixes
Merge branch 'js'

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

Conflicts:
	board.js
	index.html
	main.js
fix
smoother transitions