commit projectil
Merge branch 'master' of https://github.com/Qonic/thundermafia

Conflicts:
	Assembly-UnityScript.pidb
	thundermafia.userprefs