Made the simple fix to ghost/shape overlap (draws shape then ghost).
    by drawing the shape again after the ghost.

Conflicts:

	js/app/TetrisGame.js