Merge branch 'master' of github.com:AaronMorais/tetris-god

Conflicts:
	js/main.js
	js/shape.js
Merge branch 'master' of github.com:AaronMorais/tetris-god