ok
ok
Merge branch 'master' of https://github.com/igordeoliveirasa/kanbanrails

Conflicts:
	app/models/lane.rb