Merge branch 'master' into Josh
Fixed circle images
Merge branch 'Josh'
Merge branch 'master' of https://github.com/PreviewMedia/pinegrove

merging josh and master branch