finished the generalized collision script
Merge branch 'master' of https://github.com/gundermanc/eecs290-unity3d-final
added the generalized combat scripts to scripts folder