added config.yml to gitignore
Merge branch 'master' of github.com:cyuan92/cis350new