Rspec add and Test deleted
Merge branch 'master' of github.com:mokus80/freddit

Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/ideas/show.html.erb
	app/views/users/_form.html.erb
	app/views/users/edit.html.erb
	app/views/users/index.html.erb
	app/views/users/new.html.erb
	config/routes.rb
	db/schema.rb
	test/fixtures/ideas.yml
	test/fixtures/users.yml