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
Merge pull request #12 from JulieMarie/mongoDB

Updated .gitignore
Update .gitignore
Merge branch 'master' of github.com:green-brass-doberman/on-tapp
add grunt to automate test