added waypoint gold thing
added stuff so ben can see
Merge branch 'megan' into Ben
changed dial
separation rules and other stuff
changed dial
separation rules and other stuff
Merge branch 'master' into Ben
Merge branch 'master' into megan