Added then and now text to photos, added polaroid frame to now photo and polariod frame navigation item, refactored setOverlay to be in pictureAddition, called setTextOverlay, resolved merge conflicts.
Merge pull request #5 from HeidiHansen/mergeTakePhoto

Added then and now text to photos, added  (read further comments)