Beer feature added
Merged moar and Master