captured kittens
added users and microposts
added users and microposts
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Gemfile
	Rakefile
	app/views/layouts/application.html.erb
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb