Merge branch 'master' of C:\Users\god\Dropbox\Beer-Journal\Beer-Journal with conflicts.