rebasing for your pleasure
photo directory got messed up locally, fixing
removing forgotten git merge content
random comments