Models
Merge branch 'master' of https://github.com/kyle-piddington/JulyJam

Conflicts:
	Assets/GameAssets/Art/Materials/playerShip_diffuse_final.mat
	Assets/GameAssets/Art/Materials/playerShip_diffuse_final.mat.meta
	Assets/GameAssets/Art/diffColor_2.tga.meta
	Assets/GameAssets/Art/playerShip_diffuse_final.tga.meta
	Assets/GameAssets/Art/playerShip_final.lxo.meta
Added ship texture