changed@home
Merge branch 'master' of https://github.com/shishaoshuai/peusto
调整目标管理功能，调整个人兴趣功能
Merge branch 'master' of https://github.com/shishaoshuai/peusto

Conflicts:
	www/application/views/welcome_message.php