update path
Merge branch 'master' of https://github.com/Czhang0727/WP_intern

Conflicts:
	application/controllers/main.php
	application/models/model_users.php
Merge branch 'master' of https://github.com/Czhang0727/WP_intern