Commiting
Merge branch 'Nick_and_Guido'
Merge branch 'master' of https://github.com/neich8/ChessBored

Conflicts:
	app/assets/javascripts/chess_board.js

Merging