.gitignore
Merge branch 'master' of https://github.com/inukurax/OOPD6.git

Conflicts:
	.gitignore