update gitignore
Merge branch 'refs/heads/master' into test
updating gitignore
Merge branch 'refs/heads/test' into prod
Merge branch 'refs/heads/master' into test
Merge branch 'refs/heads/test' into prod
Merge branch 'master' into test

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
resolving merge conflict
Merge branch 'refs/heads/master' into test

Conflicts:
	themes/obermann/css/local.styles.css
Merge branch 'refs/heads/test' into prod
recompiled using new default config.rb