erm/GAMEGIRL — pull request #1 by erm (2014-12-15 13:33:10+00:00)
Title: Dev

shouldve organized this better initially, but going to try and get the master branch to be stable, then add another branch to merge from dev to for testing