conflicting
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/application.properties
CRUD working (with some issues)