Updating .gitignore
Updating wp-config.php
Merge branch 'master' of github.com:jamiebrwr/baldwindenim.com

Conflicts:
	.gitignore
Update
Merge branch 'master' of github.com:jamiebrwr/baldwindenim.com