Corrected errors post merge

Conflicts:
	client/baby-namer.css
	smart.lock