Signed-off-by: unknown <CPVR@HTIBIN332-011.bfh.ch>
Merge branch 'master' of github.com:Quentinflueckiger/Holy-Ale-Of-Beer

Conflicts:

Signed-off-by: unknown <CPVR@HTIBIN332-011.bfh.ch>