fix merge conflict
fix merge conflict

chirilo/FoundationPress,jeffdfarr/coolchoices,petemurray74/LucyBlundenFoundationPress6,josh-rathke/FoundationPress,fabianrios/blueprint,Negative-Network/FoundationPress,skoldin/FoundationPress,derweili/WAYT-WordPress-Themes,codenamesrk/WP-Starter,uroy9ch/portfolio,petemurray74/LucyBlundenFoundationPress,petemurray74/LucyBlundenFoundationPress6,derweili/WAYT-WordPress-Themes,mevrgior/foundationpress,andyow/Cream2016-FoundationPress,Schploople/ryanjp-website,jeffdfarr/coolchoices,ryancanhelpyou/FoundationPress,LaurenKett/portfolio,Digio86/artena,cyponthemic/benhaines_redesign,Adagio-design/Adagio-Foundation-Starter,adelllano/portfolio-angiedelllano,spacebetween/astral-wordpress,nsberrow/park,tipsforthings/FoundationPress,sky1tech/tms,skmezanul/FoundationPress,kateloschinina/KiRa,fabiolr/portfolio,YiTingChenJeffrey/Portfolio,SenecaOne/starter-theme2,radel/FoundationPress,Schploople/ryanjp-website,noskov/FoundationPress,alexbohariuc/FoundationPress,hfreitas92/portfolio,Guang-han/portfolio,fabiolr/portfolio,ableslayer/MMoserPress,hocu/FoundationPress,Digio86/artena,oskarno/wp_cgi_theme,linaangel/portfolio,jeviteng/FoundationPress,rollandwalsh/third-rail-wp,cfalzone/FoundationPress,jmvaranda/immortal-palm,m-maste/My-Foundation,colin-marshall/FoundationPress,derweili/WAYT-WordPress-Themes,adriantomic/ramengalen,codenamesrk/WP-Starter,EricRihlmann/FoundationPress,skoldin/FoundationPress,uroy9ch/portfolio,spacebetween/astral-wordpress,HappyChapMedia/bbw,Xabadu/punta-lobos,stirlingsohn/openeyes,bellatl/FoundationPress,petemurray74/LucyBlundenFoundationPress,sunnyuxuan/Portfolio,Negative-Network/FoundationPress,danferth/Thomson-wp-theme,JenHLab/Portfolio,namilwaukee/FoundationPress,rollandwalsh/third-rail-wp,namilwaukee/FoundationPress,adelllano/portfolio-angiedelllano,circleb/SustainLife,petemurray74/HebdenHandyman,fabianrios/blueprint,adriantomic/ramengalen,bellatl/FoundationPress,kateloschinina/KiRa,sky1tech/tms,Iamronan/FoundationPress,Xabadu/punta-lobos,marc4it/pokegame-themes,Digio86/artena,ableslayer/MMoserPress,hocu/FoundationPress,halldorel/theld-wp,LepusSorbas/FoundationPress,lgilders/virginian,KLVTZ/FoundationPress,uptownstudiosdev/newuptown,YiTingChenJeffrey/Portfolio,mik-laj/FoundationPress,Digio86/artena,cyponthemic/Subrosa2015,HappyChapMedia/bbw,pedro-mendonca/FoundationPress,tompepper/tp-foundationpress,cibonaydames/cd-theme,jmvaranda/immortal-palm,scordes11/rachel-site,fabiolr/portfolio,rollandwalsh/popart,cyponthemic/benhaines_redesign,rasmuserik/theme-solsort,sneffadi/matthewssite,linaangel/portfolio,nsberrow/park,rollandwalsh/popart,stirlingsohn/openeyes,danferth/akio-theme,karielaine/FoundationPress,shadowin1126/sspecstheme,imaginethepoet/FoundationPress,rea-glrz/wp-fantasticks,randmanrjr/FoundationPress-randman,zeppytoh/cruorgsg-fp,spacebetween/astral-wordpress,spacebetween/astral-wordpress,KLVTZ/FoundationPress,danferth/DJ-wp-theme,linuxbastard/FoundationPress,luluwuluying/myportfolio,m-maste/My-Foundation,joshsmith01/grunt-test-theme,Schploople/ryanjp-website,rollandwalsh/popart,suneric1/portfolio,joshsmith01/grunt-test-theme,sneffadi/matthewssite,petemurray74/HarveysFoundationPress,shadowin1126/TopRadioTheme,jeviteng/FoundationPress,danferth/DJ-wp-theme,uroy9ch/portfolio,alexbohariuc/FoundationPress,rasmuserik/theme-solsort,josh-rathke/FoundationPress,SenecaOne/starter-theme2,radel/FoundationPress,cfalzone/FoundationPress,circleb/SustainLife,lgilders/virginian,joshsmith01/theme-elixir,hfreitas92/portfolio,sarahkasiske/portfolio,rea-glrz/wp-fantasticks,davenaylor/FoundationPress,Adagio-design/Adagio-Foundation-Starter,LaurenKett/portfolio,zeppytoh/cruorgsg-fp,danferth/DJ-wp-theme,davenaylor/FoundationPress,rasmuserik/theme-solsort,uptownstudiosdev/newuptown,tompepper/tp-foundationpress,nsberrow/park,joshsmith01/theme-elixir,noskov/FoundationPress,andyow/Cream2016-FoundationPress,petemurray74/LucyBlundenFoundationPress,luluwuluying/myportfolio,ryancanhelpyou/FoundationPress,petemurray74/HarveysFoundationPress,petemurray74/TodFoundationPress,olefredrik/FoundationPress,caseyburton/someguycasey,scordes11/rachel-site,suneric1/portfolio,Iamronan/FoundationPress,LaurenKett/lmkettportfolio,petemurray74/TodFoundationPress,shadowin1126/TopRadioTheme,mcastre/bellmedia-a-to-z,imaginethepoet/FoundationPress,rollandwalsh/popart,caseyburton/lake-padden,ozunaj/JaredPress,skmezanul/FoundationPress,oskarno/wp_cgi_theme,randmanrjr/FoundationPress-randman,hfreitas92/portfolio,brettddevore/jacquelinesecor,ABSNyyyy/absndation,petemurray74/HebdenHandyman,sunnyuxuan/Portfolio,cibonaydames/cd-theme,colin-marshall/FoundationPress,tvnweb/Euroma2017,cyponthemic/Subrosa2015,danferth/akio-theme,tipsforthings/FoundationPress,philipptrenz/wkkv_theme,mevrgior/foundationpress,marc4it/pokegame-themes,caseyburton/someguycasey,JenHLab/Portfolio,petemurray74/HarveysFoundationPress,HappyChapMedia/be-in-the-show,EricRihlmann/FoundationPress,caseyburton/lake-padden,sarahkasiske/portfolio,cyponthemic/benhaines_redesign,LaurenKett/lmkettportfolio,shadowin1126/sspecstheme,danferth/Thomson-wp-theme,shadowin1126/TRFoundation,karielaine/FoundationPress,chirilo/FoundationPress,mik-laj/FoundationPress,philipptrenz/wkkv_theme,olefredrik/FoundationPress,LepusSorbas/FoundationPress,mcastre/bellmedia-a-to-z,halldorel/theld-wp,ABSNyyyy/absndation,HappyChapMedia/be-in-the-show,linuxbastard/FoundationPress,HappyChapMedia/be-in-the-show,pedro-mendonca/FoundationPress,tvnweb/Euroma2017,Guang-han/portfolio,shadowin1126/TRFoundation,adamfeuer/FoundationPress,brettddevore/jacquelinesecor,adamfeuer/FoundationPress,ozunaj/JaredPress