GitIgnore
Merge branch 'master' of https://github.com/davidpodhola/piranhacmsoak-examples

Conflicts:
	.gitignore