lulz
stuff
Merge branch 'master' of https://github.com/toxicbison/xX_P00N5L4Y3RZ_Xx

Conflicts:
	JackJackTyler/Assets/Prefab/bullet.prefab
	JackJackTyler/Assets/VillageScene.unity
	JackJackTyler/JackJackTyler-csharp.sln
	JackJackTyler/JackJackTyler.sln
	JackJackTyler/Library/CurrentLayout.dwlt
	JackJackTyler/Library/InspectorExpandedItems.asset
	JackJackTyler/Library/assetDatabase3
	JackJackTyler/Library/guidmapper
	JackJackTyler/ProjectSettings/TagManager.asset