f commit
Merge branch 'master' of https://github.com/Lundgrenrj/redDragon

Conflicts:
	src/main/java/red/dragon/restaurant/menu/MenuItemDetail.java
Fixing merging