my first commit
Merge github.com:bathla18/online-photography-java