trying to fix json
new method to json
Merge branch 'master' of github.com:antigoliath/PennApps2013S
changes to json
merge
Merge branch 'master' of github.com:antigoliath/PennApps2013S