Merge branch 'master' of /Users/dpeabody/Development/theCircle with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/theCircle.iml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
should be able to pic on a map now