work
Finished first round of work
Merge branch 'master' of github.com:kimmellj/derby-contact-manager-backend

# By Jamie Kimmell
# Via Jamie Kimmell
* 'master' of github.com:kimmellj/derby-contact-manager-backend:
  Rounded out the profile picture functionality

Conflicts:
	.idea/workspace.xml
	app/Config/Schema/schema.php
	app/Controller/ContactsController.php
	app/Model/Contact.php
	app/View/Contacts/add.ctp
	app/View/Contacts/index.ctp
	app/View/Contacts/view.ctp
	app/webroot/css/style.css