Delete local.xml
Merge branch 'development' into staging
ssssssssially if it merges an updated upstream into a topic branch.
Delete .gitignore
adding in gitignore
Merge branch 'development' into staging
merge
removing dodgy test colours from header & footer
Merge branch 'development' into staging
merging dev changes back in
Merge branch 'staging'
merging the staging branch into master