Merge pull request #1 from Somesingman/master

gibve bme pull reuqj
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2013
YAYA
trying to push stuff...