new model
Merge branch 'master' of https://github.com/ZofiaBialla/wilkolaki

Conflicts:
	config/mongoid.yml
add devise
Merge branch 'master' of https://github.com/ZofiaBialla/wilkolaki
add username
Merge branch 'master' of https://github.com/ZofiaBialla/wilkolaki

Conflicts:
	Gemfile.lock
	app/controllers/home_controller.rb
	app/models/user.rb
	config/initializers/devise.rb
	config/routes.rb
remove line