Manual merge
AndreiRO 300
Modified line 300, deleted sample.txt~