a clash solve
Merge branch 'newedit'

Conflicts:
	application/views/welcome_message.php