add 1.txt
modify+1
add hw1
delete 1.txt
Merge branch 'master' of https://github.com/perypery/homework_1