Testing.
Merge origin/master
Added entities, and fixed up GamePanel.