merge conflicts
merge conflicts

duke-compsci408-fall2014/Compassion,duke-compsci408-fall2014/Compassion,duke-compsci408-fall2014/Compassion,duke-compsci408-fall2014/Compassion,duke-compsci408-fall2014/Compassion,duke-compsci408-fall2014/Compassion,duke-compsci408-fall2014/Compassion