Added the final part to the git ignore, ignores all meta files, and anything to do with the Asset server.  However, sound will take forever to load.
Adding new ship textures for boss 1-1
Merge branch 'master' of https://github.com/encephalopathy/wepwep

Conflicts:
	branches/pewpew_unity_port/.gitignore
	branches/pewpew_unity_port/pewpew/Assets/Prefabs/Player Bullets/Bullet.prefab.meta
	branches/pewpew_unity_port/pewpew/Assets/Scenes/Sandbox/BaseScene.unity.meta
	branches/pewpew_unity_port/pewpew/Assets/Sounds/BGM/464352_ParagonX9___Red_13.ogg
	branches/pewpew_unity_port/pewpew/Assets/homingBullet.prefab