beer list
Merge branch 'master' of github.com:corbanb/beerthing

Conflicts:
	App/views/index.ejs