Update gitignore
Add first attempt at screenshot (fails)
Merge remote-tracking branch 'origin/master'