can delete photos and other fun things
Merge remote-tracking branch 'origin/master'