upload photo working
Merge branch 'master' into peterC
Merge pull request #15 from alankalter/peterC

Peter c