hopefully working protoype
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2013