test2
Merge branch 'master' of https://github.com/Ronde/RTOS_Project

Conflicts:
	test.txt
Risoluzione conflitto