gitignore file
Merge branch 'master' of github.com:jinslee/418-final