did work on camera and ship
Merge pull request #16 from ckhamash/master

Shots and shot powerups
Merge remote-tracking branch 'origin/master' into highlightLane

Conflicts:
	Assets/Resources/Prefabs/Player/Ship.prefab
Added in highlighting of lanes
fix
Merge pull request #17 from KirbyAu2/highlightLane

Highlight lanes and bug fixes
resolved conflict
Merge branch 'update' of https://github.com/ckhamash/SpaceTwitch