Adding gitignore to Master
Merge branch 'master' into AndrewBranch