Add gitignore file
Merge branch 'master' into touch_tomorrow