Added emotions to core daa
Merge branch 'master' of https://github.com/Grantismo/after_care

Conflicts:
	AfterCare.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/Grantismo/after_care

Conflicts:
	AfterCare.xcodeproj/project.pbxproj
fixed project settings