Merge branch 'master' of https://github.com/Lolirofle/Private_C_Includes

Conflicts:
	.gitignore