feature change 1
feature change 2
Merge branch 'master' into feature

Conflicts:
	README.md
feature change 3
feature change 4
Merge branch 'master' into feature

Conflicts:
	README.md
feature change 5
feature change 6
master change
app change
feature change 7
feature change 77
Merge branch 'master' of https://github.com/gregz67/Beer

Conflicts:
	app.js