próby z devise
k
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	db/development.sqlite3