Initial commit
Added .gitignore
Modified .gitignore
Merge changes