plus comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	lesson_kartes/index.html.erb