Totally f'ing up :-/
1
updated links in index.html
deleted app.js
Adding in api-key.js
Merge branch 'master' of https://github.com/green-brass-doberman/on-tapp

Conflicts:
	client/index.html
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