about
Merge branch 'master' of https://github.com/helmeloh/heli

Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	app/models/you2heli.rb
	app/views/users/show.html.erb
	db/schema.rb
	lib/tasks/sample_data.rake
	spec/models/you2heli_spec.rb