"Miscellaneous"
Merge branch 'master' of https://github.com/jakegreen/address_book

Conflicts:
	server/controllers/contact.js