added health
Merge branch 'master' of https://github.com/leaflet757/cs20

Conflicts:
	entities/map.js
	main.js
Beam Weapon Functionality
main
Merge branch 'enemies' of https://github.com/leaflet757/cs20

Conflicts:
	entities/map.js
Revert 53d0748..f27e2c9

This rolls back to commit 53d074857634270445a4ca43d6a34708827fe795.
Revert 0d5473e..57d2c15

This rolls back to commit 0d5473e31ec33f8df1d9acab9d0400e74a9b4e8d.
Fixed Map Merge
Revert 53d0748..d49ca01

This rolls back to commit 53d074857634270445a4ca43d6a34708827fe795.
quick changes
added sounds and shit
Merge branch 'master' of https://github.com/leaflet757/cs20

Conflicts:
	main.js
fixing main
Wave Force changed
Merge branch 'master' into weaponsbranch

This reverts commit b900b94e0abd5519b41f2417b69fa0678a617a10.

Conflicts:
entities/map.js
Merge branch 'weaponsbranch'

Conflicts:
	entities/player.js
	entities/weapons.js
Merge branch 'master' into weaponsbranch
enemies do more shit!

WOOOOOOOOO
enabled disabling onscreen test for drawing
Merge branch 'master' of https://github.com/leaflet757/cs20