minor random changes
got basic collisions working, including laser/speed damage
a few minor changes
Merge branch 'master' of https://github.com/masonnl/softDev
Merge branch 'master' into dhakimian
ASTEROID COLLISION FRENZY
merge in asteroids; handle already colliding (overlapping) objects
Added support for animated textures
changed the name of a variable
Integrated in Rob's work with sound etc. from his branch
got weapon upgrading working correctly