infinite loop
merging problems
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2013