ignoring files
Merge branch 'master' of https://github.com/JulesWulms/database-technology

Conflicts:
	.gitignore