blabla liten skitsak
faan
Merge branch 'master' of https://github.com/galaxyAbstractor/ducking-octo-ninja

Conflicts:
	application/controllers/user.php