added gitignore
merged conflicts
new file
Merge branch 'master' of github.com:worki2k1/test1
test2