All changes made pre merge
Update main file attempt 1

Transfer main file over to run new code
Merge stage 2

Movement working for both players and enemies.  No miscellaneous
crashing
Get attacking functional

No time delay, gun not acting properly.