create story model and controller
new, create, show for story with validation for user id
Merge branch 'master' into story_table

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
	db/schema.rb
created user and story associations
user can create and view stories
fixed file discrepencies