updated db password
pulled down wp from server
this is what is online right now, 10-12-2014
Merge branch 'wp3.8'

Conflicts:
	wp-config.php