final commit
final commit again
Merge branch 'master' of https://github.com/thematchboxstudio/vital

Conflicts:
	wp-config.php