specs or something
Merge branch 'master' into specs

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
	spec/features/sign_up_spec.rb
configured rspec + capybara finally
bad but working tests
better specs
new capybara
acceptance tests