modified Player collision code, fixed some import issues, cleaned up a bit, mostly finished adding enemies to the map