krockars
Merge branch 'master' of https://github.com/godiagonal/includes_klar

Conflicts:
	index.php