Merge branch 'master' into Ning
rescaled the trash can
Merge branch 'master' into Ning

Conflicts:
	Unity Project/Assets/Scenes/WordMaking.unity
Merge branch 'master' into Ning
added taste display for each character
Merge branch 'Ning'