exclude self in Nearby, fix 12pm bug
Merge branch 'master' of https://github.com/shikharmohan/MealLink---EECS-394

Conflicts:
	.DS_Store