add 3
add
Merge branch 'master' of https://github.com/yangjun/eval

Conflicts:
	client/app/scripts/models.js
	client/app/scripts/routes.js
	client/app/templates/count.handlebars