Initial commit
merged .gitignore changes