Added .gitignore
Merged changes from master