Changed merge from master
Still trying to fix merge with Master.
Fixed Merge
Fixed merge conflicts
Created Bet Class
Gun Class added. Time class added. Optimizations done.
Collision Fix
Collision Update. Not complete.