edited gitignore
Merge branch 'master' of https://github.com/andzelastojanoska/food_order

Conflicts:
	FoodOrder/target/classes/META-INF/maven/com.seavus.foodorder/FoodOrderCompleteV3/pom.properties