Beams and collision detection

Added beam shooting and collision detection.
Fixed beams and enemy shooting.
Revert "Test- Nitpicky style stuff"

This reverts commit cc1542445f2af437f3f6c35585a077329b646987.
Merge remote-tracking branch 'origin/Nathan'