minor edits
merge conflicts
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/Compassion
services for theme data added