conflict resolve
Merge branch 'master' of https://github.com/ZofiaBialla/wilkolaki
autheticate user
change
Merge branch 'master' of https://github.com/ZofiaBialla/wilkolaki

Conflicts:
	config/initializers/cookies_serializer.rb
	config/initializers/devise.rb
deleted file
Merge branch 'master' of https://github.com/ZofiaBialla/wilkolaki