coffeescript jquery plugin
Merge branch 'master' of github.com:bingquan3846/resume-online

Conflicts:
	.idea/workspace.xml