changed gitignore
Merge branch 'master' of https://github.com/Liontack/ProftaakP4

Conflicts:
	.gitignore