Player alignment fixed
Added shot reload and limit
Merge remote-tracking branch 'upstream/master' into update

Conflicts:
	Assets/Resources/Prefabs/Player/PlayerProjectile.prefab
	Assets/Scripts/Player/Player.cs
fixed merge issues
Multi-shot and Rapid-fire
quick powerup fix
increase max shots for multishot powerup
quick fix
Merge pull request #16 from ckhamash/master

Shots and shot powerups