Updated gitignore
Merge branch 'master' of https://github.com/nicorellius/acrosite
Added settings file
Merge pull request #1 from nicorellius/add-settings

Merged