Hashtag fix

Hashtag fix
Hashtag fix

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

Conflicts:
	.gitignore