Edit comment

Conflicts:

	application/controllers/welcome.php