Test
Merge branch 'master' of https://github.com/Corax26/test-git

Conflicts:
	new_file.h