data model and photo change
fix merge conflicts
add photo back
delete photo
Merge branch 'master' of https://github.com/Nicktaylor1207/likeme_landing_pages