.gitignore is now working
Merge remote-tracking branch 'origin/master' into Networking

Conflicts:
	Assets/Scripts/Misc (old)/Gravity.cs
	Assets/Scripts/Misc (old)/Gravity.cs.meta
	Assets/map.unity.meta