mer layoutfixar
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/annons/show.php
	public/css/style.css