worked on map view and adding annotation
Merge branch 'Tuesday'

Conflicts:
	ComposeViewController.m

committing Tuesday with changes to Compose
Formatting
Merged from Tuesday
Added takePicture