Smal change in users
Merge branch 'master' of https://github.com/casperpschultz/site

Conflicts:
	application/controllers/user.php