gifs on robot buttons, added scaling variable for robot energy
conflict resolved
merge Merge branch 'master' of github.com:dmazin/asteroid-tycoon