1111
Merge branch 'master' of https://github.com/Zalastra/CandyRain.git

Conflicts:
	js/Board.js
Merge branch 'master' of https://github.com/Zalastra/CandyRain.git
scooore