Worked on API parsing
giMerge branch 'master' of https://github.com/camcross/p45_project

Conflicts:
	app/controllers/stories_controller.rb
	app/models/story.rb
g
fixed merge conflicts