no message
testing
Trying to pull, nothing usefull
Merge branch 'master' of https://github.com/volterr/FavorTripPals

Conflicts:
	code/pom.xml
	code/src/main/resources/config/database/db.properties

+log4j