Player can now move
WIP Move method in Entity
Merge remote-tracking branch 'origin/master'