generated scaffold for user, story, and comment
generate scaffolding for user, story, comment
Merge branch 'master' of https://github.com/cookjj/bangdot
"merge"
ease enter a commit message to explain why this merge is necessary,
needs to merge
Merge branch 'master' of https://github.com/cookjj/bangdot

Conflicts:
	app/views/stories/show.html.erb