some todos
Merge branch 'new-structure' of github.com:blastmaster/BeerPlusPlus into new-structure
override bug again