Committing a general framework for Player/Enemy, to work out the details
Did minor little changes
Merged i think