trash
Merge branch 'master' of https://github.com/GitNiko/testRepo

Conflicts:
	test_git/test.c
as