Player updates

Added player to entities
Added some collision mapping
Added player to testlevel