merge
Merge branch 'master' of https://github.com/AdamSheaffer/chess-game
Merge branch 'master' of https://github.com/AdamSheaffer/chess-game

Conflicts:
	main.js
Merge branch 'master' of https://github.com/AdamSheaffer/chess-game
reworking the king rules