Cleaned last merge.
Fixed a huge mess of things from former merges. - Aaron Weiss
Merge remote-tracking branch 'aaronweiss74/master'
Added comments to <code>ShooterComponent</code> class
Merge pull request #11 from pavanh91/master

Commented ShooterComponent