branch to master - Antoine
Merge branch 'master' of https://github.com/Trevorr1/Minor_Game.git
Updated Project Filters
Collision Component
Merge branch 'master' of https://github.com/Trevorr1/Minor_Game.git
Made basic collision algos
Touched up some classes for collision logic
Little collision fixes