first commit
adding ignore file
testing .gitignore
update
removed file
merging