Should be only sync...
why god why...
go go go
Merge remote-tracking branch 'origin/master'

Conflicts:
	kornell-api/src/main/resources/db
merging
merging
merging
Mete GIT, mete!