Altered .gitignore
Merged from laptop