merging some shit
Merge branch 'master' of github.com:callmemc/altbreaks

have to merge again or something
merging with michelle's shit
fuck
Merge branch 'master' of github.com:callmemc/altbreaks

merging fucking shit AGAIN
map popup pulls photos from testimonies, fixed multiple popup issue
merging fucking gemfile.lock