gitignore
Merge branch 'master' of github.com:simon-scherzinger/PitchrModule

Conflicts:
	.gitignore
empty project