changed dev to production
Merge branch 'Production-DB-credentials'
Merge remote-tracking branch 'origin/dev'

Conflicts:
	wp-config.php
removed git code
Merge branch 'dev'
fix wp_config conflict
Merge branch 'fix-conflict'
removed for test
revert test change
ready wp-config for production
gitignore update
Merge branch 'staging'
switched to wp-config-prod.php
Merge branch 'staging'

Conflicts:
	wp-content/themes/flix/header.php
fixed conflict
Merge branch 'dev' into staging
Merge branch 'staging'
added quote css
commented out password cookie
merge