Merge pull request #47 from pamelawang/master

GamePanel should be working.
Merge pull request #48 from pamelawang/meera

Merge pull request #47 from pamelawang/master