Update .gitignore
Merge branch 'master' of ssh://git@github.com/alexrcoleman/Jolex-Website.git into JoeBranch
l