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