Removed one etta
Merge branch 'master' of https://github.com/sjoelinder/Portalen

Conflicts:
	index.php