Added User and Micropost resources
Merge branch 'master' of github.com:ksletmoe-elemental/rails_tutorial_scaffolding_app

* 'master' of github.com:ksletmoe-elemental/rails_tutorial_scaffolding_app:
  Added User and Micropost resources

Conflicts:
	db/schema.rb