solidified player movement
bullets complete need testing
Merge branch 'master' into bulletserver