Merge pull request #23 from diabeteuz/master

updated panel
Merge pull request #7 from acesarewild/master

updates(3/6/13)
to test within GUI
Merge pull request #24 from aquang93/master

testing user and gameplay in GUI
Merge pull request #1 from acesarewild/master

1040