Merge pull request #17 from Camwyn/develop

Added position tracking and collision detection
Merge pull request #18 from Camwyn/develop

Added all objects as stubs
Made collision detection smarter
Added most block behaviors
Merge pull request #21 from lkrenitsky/develop

Added appropriate collision detection responses, block pushing behavior
Merge pull request #1 from OctopodGames/develop

Develop