Fixed dfm issue in amusement park physics
Merge pull request #973 from stowellm/goat

Fixed dfm issue in amusement park physics
Merge remote-tracking branch 'upstream/master' into jp923
Redid bottom bar buttons