#bakgrund
Merge branch 'master' of https://github.com/MarcusBergman/Live

Conflicts:
	application/views/om.php.html