removed unnecessary param
removed unnecessary cruft
added back button
fixed merge conflicts
resolved merge conflicts
removed cruft from fragments and put photos in the right order
Fixed merge conflicts. Edited gitignore