Commit before merge from main.
Merge branch 'master' into Jake-MapKit
Removed a dead variable
Merge branch 'master' into TuesdayNate
Merge branch 'master' into Jake-MapKit
Merge branch 'master' into Jake-MapKit
Merged from master
Merge branch 'master' into Jake-MapKit
Added Randall's code for the addNewStory method.
Lots of work in the network controller. We technical ca get JSOn now from the server by going ti the userid route. There are several placeholder properties here, but the prototype is complete
Merge branch 'master' into TuesdayNate
Merged from Origin Master.
Merge pull request #10 from LocalStory/TuesdayNate

Tuesday nate
Fleshed out the mapview and annotation methods a bit more. Removed NSNotificationCenter stuff, since the main map will be updated by the server, not the story creation VC. Removed a duplicate method.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into Jake-MapKit
Merged from master and filled in fetchStoriesForSpan method.
Merge pull request #11 from LocalStory/Jake-MapKit

Jake map kit
Merge branch 'master' into ViewingStory
merge with master