Change this function.
Merge branch 'master' of github.com:Kristina-B/PHP

Conflicts:
	templates/edit.php