test2
Merge branch 'master' of https://github.com/Vicky-fan/test

Conflicts:
	invite/assets/css/index.css