some edits to the documentation
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/Compassion
modularised json
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/Compassion