Data Logging Available
Merge branch 'master' into john-3

Conflicts:
	Assets/Scripts/MonsterRelated/MonsterScript.cs
	ProjectSettings/Physics2DSettings.asset
Merge branch 'john-3'
Merge branch 'master' of https://github.com/weiligu/ItinerantCity

Conflicts:
	Assets/Scenes/ItinerantCity.unity
	Assets/Scripts/CombatScript.cs
.