map crap
Merge pull request #2 from leaflet757/maps

map crap
Merge branch 'weaponsbranch' of https://github.com/leaflet757/cs20
Merge branch 'master' of https://github.com/leaflet757/cs20
Deleted Beam in Master
Merge branch 'master' into weaponsbranch

Conflicts:
	entities/weapons.js