testing commit conflict
image generator works now
Merge branch 'gh-pages' of https://github.com/lookitscook/m.joy
updated images to google drive location
corrected image paths
Update _config.yml
updated thumbnail
added cath+josh post
Merge pull request #1 from lookitscook/gh-pages

Image generator work
homepage layout update, boudoir page
content and style updates
minor content fixes and carousel update
removed extra files and moved content images to google drive
removed bg texture image
homepage updates
fixed sample image links
instagram is live, social links
completed homepage footer
thanks page update
updated forms