add contribution and style guide
Merge pull request #7 from JulieMarie/mongoDB

Mongoose dependency added to package.json [Delivers #84962542]
Merge branch 'master' of github.com:green-brass-doberman/on-tapp
Merge pull request #8 from victorleungtw/master

add style guide
Merge branch 'master' of github.com:green-brass-doberman/on-tapp
setup karma test environment
Merge pull request #9 from victorleungtw/master

setup karma test env.
first deploy
add heroku deploy and circle yml
Merge pull request #10 from victorleungtw/master

Add heroku and circleli settings
first test passing
edit test
Merge branch 'master' of github.com:green-brass-doberman/on-tapp
Merge pull request #11 from victorleungtw/master

setup first karma test for angular and make it pass
Updated .gitignore to include mockup and bash profile
Merge branch 'master' into mongoDB

Conflicts:
	.gitignore