ignore file
Merge branch 'master' of https://github.com/S25E/Project

Conflicts:
	.gitignore