Merge pull request #13 from alankalter/peterC

Peter c
getting latest changes
commting
Merge pull request #14 from alankalter/Carlos

Carlos
upload photo working
Merge branch 'master' into peterC