no message
Merge branch 'master' of https://github.com/bpiwowar/foodmap

Conflicts:
	src/main/java/coria2015/FoodMapServer.java