modify gitignore
No longer track the view folder
modify gitignore to ignore everything in view
Merge master and development