added user form spaces
Merge branch 'master' of github.com:jakenherman/houstonbook

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README.md
	README.rdoc
	Rakefile
	app/assets/images/.keep
	app/assets/images/glyphicons-halflings-white.png
	app/assets/images/glyphicons-halflings.png
	app/assets/javascripts/application.js
	app/assets/javascripts/bootstrap.js
	app/assets/javascripts/pages.js.coffee
	app/assets/javascripts/statuses.js.coffee
	app/assets/stylesheets/application.css
	app/assets/stylesheets/bootstrap.css
	app/assets/stylesheets/pages.css.scss
	app/assets/stylesheets/scaffolds.css.scss
	app/assets/stylesheets/statuses.css.scss
	app/controllers/application_controller.rb
	app/controllers/concerns/.keep
	app/controllers/pages_controller.rb
	app/controllers/statuses_controller.rb
	app/helpers/application_helper.rb
	app/helpers/pages_helper.rb
	app/helpers/statuses_helper.rb
	app/mailers/.keep
	app/models/.keep
	app/models/concerns/.keep
	app/models/status.rb
	app/models/user.rb
	app/views/layouts/application.html.erb
	app/views/pages/About.html.erb
	app/views/pages/Home.html.erb
	app/views/statuses/_form.html.erb
	app/views/statuses/edit.html.erb
	app/views/statuses/index.html.erb
	app/views/statuses/index.json.jbuilder
	app/views/statuses/new.html.erb
	app/views/statuses/show.html.erb
	app/views/statuses/show.json.jbuilder
	config.ru
	config/application.rb
	config/boot.rb
	config/database.yml
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/backtrace_silencers.rb
	config/initializers/cookies_serializer.rb
	config/initializers/devise.rb
	config/initializers/filter_parameter_logging.rb
	config/initializers/inflections.rb
	config/initializers/mime_types.rb
	config/initializers/session_store.rb
	config/initializers/wrap_parameters.rb
	config/locales/devise.en.yml
	config/locales/en.yml
	config/routes.rb
	config/secrets.yml
	db/migrate/20140530033654_create_statuses.rb
	db/migrate/20140531190705_devise_create_users.rb
	db/schema.rb
	db/seeds.rb
	lib/assets/.keep
	lib/tasks/.keep
	log/.keep
	public/404.html
	public/422.html
	public/500.html
	public/favicon.ico
	public/robots.txt
	test/controllers/.keep
	test/controllers/pages_controller_test.rb
	test/controllers/statuses_controller_test.rb
	test/fixtures/.keep
	test/fixtures/statuses.yml
	test/fixtures/users.yml
	test/helpers/.keep
	test/helpers/pages_helper_test.rb
	test/helpers/statuses_helper_test.rb
	test/integration/.keep
	test/mailers/.keep
	test/models/.keep
	test/models/status_test.rb
	test/models/user_test.rb
	test/test_helper.rb
	vendor/assets/javascripts/.keep
	vendor/assets/stylesheets/.keep
Merge branch 'master' of github.com:jakenherman/houstonbook