buggfix

ayada
Merge branch 'master' of https://github.com/berthsjo/powerpuff

Conflicts:
	.gitignore
	admin/skriv-post.php