Merge pull request #1 from wraith321/develop

30.06. 14:00
Waffen Scripts
Fix
Merge branch 'develop' of https://github.com/wraith321/SAEGame1 into develop

Conflicts:
	Assets/Models/Desert Eagle.meta
	Assets/Models/Desert Eagle/Desert Eagle.FBX.meta
	Assets/Textures/Desert Eagle.meta
	Assets/Textures/Desert Eagle/DesertEagle_dDo_d.tga.meta
	Assets/Textures/Desert Eagle/DesertEagle_dDo_g.tga.meta
	Assets/Textures/Desert Eagle/DesertEagle_dDo_h.tga.meta
	Assets/Textures/Desert Eagle/DesertEagle_dDo_n.tga.meta
	Assets/Textures/Desert Eagle/DesertEagle_dDo_s.tga.meta
Merge pull request #13 from TJ-247/develop

Fix