modified .gitignore
merged braches