add
change app.js
Merge branch 'master' of https://github.com/booles/teamwork
Merge pull request #1 from bestdqf/master

好！
Merge pull request #2 from bestdqf/master

第二次提交
Merge branch 'master' of https://github.com/booles/teamwork
updata gruntfile.js
Merge remote-tracking branch 'wangyun/master'

Conflicts:
	Gruntfile.js