test commit
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
work in progress on drag-n-drop
Merge branch 'master' of https://github.com/greyarch/chess-board

Conflicts:
	chess-board.js
merged Jeroen's changes for drag'n'drop
merged Jeroen's implementation of drag'n'drop
merged Jeroen's implementation of drag'n'drop