Updates .gitignore
Merges
Implements frowning for missed touches
Merge branch 'master' into jordan