Added Entity and Player classes
Updated formatting to meet java conventions
Added linebreak
Merge branch 'temp'