rails generate scaffold Micropost content:string user_id:integer
Merge branch 'master' of https://github.com/pugiemonn/railstutorial

Conflicts:
	config/routes.rb
	db/schema.rb
delete files