Merge pull request #37 from nelsonriley/master

Upload photos to server and s3
Update contributing guide for deploying to heroku
Add back photo creation in the browser
Merge branch 'master' of https://github.com/Face-Off/faceoff
Merge pull request #38 from davegw/master

Add photo creation option
Update contribution guide
Create project ReadMe
Fix typos and tweak copy
Merge branch 'master' of https://github.com/Face-Off/faceoff
Server code clean-up
Toggle dev and production API routes
Merge pull request #39 from davegw/master

Code clean-up (primarily server code)
Photo create comments
Merge pull request #40 from areagray/master

Photo create comments
Server changes for cloud deployment
Merge pull request #41 from areagray/master

Server changes for cloud deployment
Search phone contacts by name