1-15-2014
Merge branch 'master' of github.com:jakegreen/address_book

Conflicts:
	public/js/controllers.js
	public/partials/addContact.jade