map location and color for PINs.
Merge branch 'master' of https://github.com/yijiem/CMU-Friends-new

Conflicts:
	CMUFriends/Base.lproj/Main.storyboard