data proofing
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/Compassion

Conflicts:
	Compassion/.DS_Store
padding