Merge branch 'master' into doug
Merge branch 'ian' into doug
Merge branch 'ian1' into doug
Merge remote-tracking branch 'origin/master' into doug
added gitignore

to fix the ‘uncommitted change” error
updated gitignore
Merge pull request #1 from dsherida/doug

Doug