delect test.txt
update
update
update .gitignore
Merge branch 'master' of github.com:carney520/test