Merge branch 'dev' of git@github.com:rdholder/2dog.git into dev
Merge branch 'dev'
v0.0065 Changed BangBang enemies vector to QMap. Started enemy collision detection.

Signed-off-by: jcdugger <janice@feetwetcoding.com>
Merge branch 'HEAD' of git@github.com:rdholder/2dog.git into dev