Totally f'ing up :-/
1
updated links in index.html
deleted app.js
Adding in api-key.js
Merge pull request #36 from JulieMarie/azure

Added info to brewery listings and created beers listing page
Merge branch 'master' of https://github.com/green-brass-doberman/on-tapp

Conflicts:
	client/index.html
fix karma test
Merge pull request #37 from victorleungtw/master

fix karma test
use firebase to store ratings
setup the grunt file
Merge pull request #38 from victorleungtw/master

setup grunt for some automated task
fix package json
Totally f'ing up :-/
1
deleted app.js
Merge branch 'master' of https://git.heroku.com/on-tapp
Merge pull request #39 from victorleungtw/master

fix package json
Merge branch 'master' of github.com:green-brass-doberman/on-tapp
add authentication dependencies