record keeping
Update .gitignore

Added tilde
merge Max into master
Merge branch 'Max'