Added view directory to gitignore
Merging