fixing sampling error on sprite tiles
Merge branch 'master' of https://github.com/funinvegas/ProjectLovecraft

Conflicts:
	Unity/Assets/World/SpawnVillage/Map.json
	Unity/Unity-csharp.sln
	Unity/Unity.sln
	Unity/Unity.userprefs
ignoring user prefs
Physics!
two missed files
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Unity/Assets/World/SpawnVillage/Map.tmx
	Unity/Unity-csharp.sln
	Unity/Unity.sln
Stupid files.