hello
jhsejsdj
com
Merge branch 'master' of https://github.com/cjinle/cms1

Conflicts:
	application/controllers/main.php
	application/controllers/welcome.php
	application/models/common_model.php
	application/views/nav.php