Change to gitignore
Merge branch 'master' of https://github.com/coty91/pjNotes

Conflicts:
	.gitignore~