Testing out Enemy weapons in FromSpace.unity. Commented out CameraShake code in PlayerLogic.cs.
Merge branch 'master' of https://github.com/encephalopathy/wepwep

Conflicts:
	branches/pewpew_unity_port/pewpew/Assets/Scenes/FromSpace.unity
Merge branch 'master' of https://github.com/encephalopathy/wepwep
Merge branch 'master' of https://github.com/encephalopathy/wepwep
Got rid of the white line in space.png. Moved things around to make sure bullets shoot correctly in Level_1-1.unity.