merged Ana's valueable contribution
merged
fixed conflict bewteen Kyle and Ben test.txt documents