deploy to server fixed merge issues
Merge branch 'master' of github.com:gburdge/recipe-organizer