Merge pull request #3 from Pyriana/master

Adding the changes of the last day.
Drawing first succesfull sprite tiles
Merge pull request from pyriana
Merge branch 'master' of https://github.com/Pyriana/ProjectLovecraft

Conflicts:
	Unity/Assets/World/SpawnVillage/Map.json
merge test
Test commit.
Merge remote-tracking branch 'upstream/master' into mapwork

Conflicts:
	Unity/Assets/World/SpawnVillage/Map.json
	Unity/Unity-csharp.sln
	Unity/Unity.sln
	Unity/Unity.userprefs
Merge pull request #5 from Pyriana/mapwork

Mapwork
Shrunk map.