Updated .gitignore
Merge branch 'master' of github.com:PendragonDevelopment/athena