fucking around
Added logic in user controller to display users by proximity to current
Fixed conflicts. No big thang