photo attachments added
fixing layout
merging
merging cat pic functionallity

Merge branch 'BobbyRichmond-master'