use sass,compass,requirejs,r.js
Merge branch 'master' of github.com:TERRILLTANG/profile

Conflicts:
	LICENSE
	README.md
	about.html
	index.html
	js/app/index.js
	js/common.js
	js/common/common.js
	sass/index.scss
resolve lf will be replaced crlf