trying to merge
just wanna pull
Merge branch 'master' of https://github.com/sheltonli/csc309a1
collison for one bullet
resolving conflicts
collisions with multiple bullets and aliens