Edited test.txt in local directory
Merge branch 'master' of https://github.com/Vandenn/ADVANDBMP1

Conflicts:
	test.txt