switched database to use id
delete cliffhanger
Merge remote-tracking branch 'upstream/master'

Conflicts:
	examples/databases/contacts.sql