a a dadsni hao
增加User和Task
修改style.css
finish plugin
finish plugin
finish plugin
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	www/css/style.css
	www/js/app.js
	www/js/controllers.js
	www/templates/tutorial.html