merge conflicts on .DS_Store
merge conflicts on .DS_Store

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