fixed merger issues

Flickr account for photos

username: cs344wko
password: cs344wsu