updated survey your neighbors
Merge pull request #88 from opentechinstitute/issue-75

Removes leftover markers from merge conflict

reviewed by areynold