Edit to fit MrWilon's JSON format
Merge branch 'master' of github.com:UWCS/psychic-octo-adventure