I don't even know what I did anymore....
Fixed merging
Merge branch 'master' of github.com:antigoliath/PennApps2013S