fix on master branch
update gitignore file
add test.txt
resolve merge issues
add another completed code