I DO NOT KNOW HOW TO USE GIT.
Adding config file to gitingore
Merge branch 'matt'
Merge branch 'master' into matt