Init commit
Merge branch 'master' of https://github.com/Ryccoo/school_project

Conflicts:
	.gitignore