Added gitignore
Merged master