Merge pull request #54 from ebbyw/Ebby

Ebby
Merge pull request #55 from ebbyw/Ebby

pill button position, counters count up on EOL menus
Merge pull request #56 from ebbyw/Ebby

Fixed Situation where character doesn't stop moving
Level Updates
oops
Level Updates
Level Updates!
Downtown Update
Level Updates to Scene Manager

Infections not reducing star count
Level Updates
Level Update

Downtown sets
All Levels, New Prefabs

Levels all complete, need all animals to be chase-able
Added prefabs for water bottle/automobile design patterns
Merge branch 'master' into Ebby

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scenes/Level 4 - Suburbs.unity
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/93/9314d75fdf7fd436cae93d948e44a6cd
	ProjectSettings/EditorBuildSettings.asset