minor changes
start of above ground
Merge branch 'paddatrapper-attack'
Merge remote-tracking branch 'upstream/master' into map