Blocks. Also I managed to break Display somehow
Merge branch 'master' of git@github.com:bcwadsworth/Minecraft-2D.git
Added two block images, image class, etc