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 branch 'master' of github.com:green-brass-doberman/on-tapp
Merge branch 'master' of github.com:green-brass-doberman/on-tapp
use meanjs boilerplater
add dependency
generate modules
add controllers and routes
edit navbar
fix dependency
fix api route
add css files
update icon
fix logo
Merge pull request #42 from victorleungtw/master

migrate to mean.js boilerplate