Conflict change on 2.
Merge branch 'master' of https://github.com/andthebrain/TestCProject.git

Conflicts:
	TestingGit/some_code.c