s
delete
added
a
added files
Merge branch 'master' of http://github.com/qxj1989/www into dev
a
ds
a
Merge branch 'dev' of https://github.com/qxj1989/www into dev

Conflicts:
	index.php
removed 1 and q files
did some work