Updated Photo.java
Merge branch 'master' of https://github.com/stepin2it/jun2014