added gitignore
changes to text with dad over my shoulder
Merge branch 'master' into gh-pages