Merged some stuff

I would be more informative but no
Changed planet file string random thing
Window caption added
Added player animation (not working sorry)