as
Merge branch 'master' of https://github.com/greenflame/my-git-repository

Conflicts:
	c-language/final-project/final-project/main.c