Merge branch 'master' into Hannah
changes to the diner
new diner!
more cool changes
Merge branch 'Hannah'

Conflicts:
	Unity Project/Assets/Letters/EffectPrefabs/Multiplier Text.prefab
	Unity Project/Assets/Letters/EffectPrefabs/Score Text.prefab
Merge branch 'master' of https://github.com/cs327/WordSnack