Merge pull request #1 from empowerchris/dan

Dan
Front End changes to app.
Merge branch 'master' of https://github.com/empowerchris/to_do_search into chris

Conflicts:
	app/views/people/show.html.haml
Updated front end and UX.
Merge pull request #2 from empowerchris/chris

Chris
Updated edit page to include photo upload.  Aligned show page buttons.
Merge pull request #3 from empowerchris/chris

Updated edit page to include photo upload.  Aligned show page buttons.
Added partial for people show page.
Merge pull request #4 from empowerchris/chris

Added partial for people show page.
ade the task status changeable on the task show page and on the people show pages