Fixed conflicts with self

Project no longer broken.
Added triggers for each emotion with sprites
Merge remote-tracking branch 'origin/NormanBranch' into TimBranch

Conflicts:
	Assets/test.unity