gitignore
tried ignoring
Merge branch 'master' of https://github.com/berthsjo/powerpuffs

Conflicts:
	includes/config.php