merge
Merge branch 'master' of https://github.com/JaickGrin/mentoring

Conflicts:
	.gitignore