Initial commit
Finish
Merge branch 'master' of heroku.com:infinite-plateau-1072

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	Rakefile
	app/assets/javascripts/application.js
	app/controllers/application_controller.rb
	app/controllers/microposts_controller.rb
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/helpers/users_helper.rb
	app/models/micropost.rb
	app/models/user.rb
	app/views/layouts/application.html.erb
	app/views/users/edit.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	config/application.rb
	config/database.yml
	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