merge bugfix
Merge branch 'master' of github.com:silverdev/BoilerPlateHTML5Canvas2D

Conflicts:
	Grid.js