Fix merge conflicts.

README.md

@@ -1,32 +1,32 @@
 # Remote-friendly companies
 
-An incomplete and unverified list of semi to fully remote-friendly companies in or around tech. Please send a pull request if you have any additions or changes. Pull requests will be accepted if the company is at least partially remote, they are added in alphabetical order in the list, and are added with a website.
+An incomplete list of semi to fully remote-friendly companies in or around tech. Please send a pull request if you have any additions or changes. Pull requests will be accepted if the company is at least partially remote, they are added in alphabetical order in the list, and are added with a website.
 
 
 Name | Website | Verified
 ------------ | ------- | --------
-&yet | https://andyet.com | 
+&yet | https://andyet.com | X
 10up | http://10up.com/ | 
 112 Tech | https://iTech.applytojob.com | 
 17hats | http://www.17hats.com | 
 18F | https://18f.gsa.gov/ | 
 Acquia | http://www.acquia.com/ | 
 Android Authority | http://www.androidauthority.com | 
-apartment therapy | http://www.apartmenttherapy.com/ | 
+apartment therapy | http://www.apartmenttherapy.com/ | X
 Appstractor Corporation | http://www.appstractor.com | 
 Arkency | http://arkency.com/ | 
 Articulate | https://www.articulate.com | 
 Auth0 | https://auth0.com/ | 
-Automattic | https://automattic.com/ | 
-Basecamp | https://basecamp.com/ | 
-basho | http://basho.com/ | 
+Automattic | https://automattic.com/ | X
+Basecamp | https://basecamp.com/ | X
+basho | http://basho.com/ | X
 BeBanjo | http://bebanjo.com/ | 
 Bizink | http://bizinkonline.com | 
-Black Pixel | https://blackpixel.com/ | 
+Black Pixel | https://blackpixel.com/ | X
 Bloc | https://bloc.io/ | 
 Bluespark | https://www.bluespark.com/ | 
 Bright Funds | https://www.brightfunds.org | 
-buffer | https://buffer.com/ | 
+buffer | https://buffer.com/ | X
 BuySellAds | https://buysellads.com | 
 Canonical | http://www.canonical.com/ | 
 Cards Against Humanity | https://cardsagainsthumanity.com/ | 
@@ -34,25 +34,25 @@ CartoDB | https://cartodb.com/ |
 CartStack | http://cartstack.com | 
 Catalyze | https://catalyze.io/ | 
 charity: water | http://www.charitywater.org/ | 
-Chef | http://chef.io/ | 
+Chef | http://chef.io/ | X
 CircleCI | https://circleci.com/ | 
 Clevertech | 9 | 
 Close.io | http://close.io | 
 Codeship | https://codeship.com/ | 
 Collabora | https://www.collabora.com/ | 
 Compose | https://www.compose.io/ | 
-CoreOS | https://www.coreos.com/ | 
+CoreOS | https://www.coreos.com/ | X
 Coupa | http://www.coupa.com/ | 
-DataStax | http://www.datastax.com/ | 
+DataStax | http://www.datastax.com/ | X
 DealDash | http://www.dealdash.com | 
 Delighted | https://delighted.com | 
-DigitalOcean | https://www.digitalocean.com/ | 
+DigitalOcean | https://www.digitalocean.com/ | X
 DNSimple | https://dnsimple.com/ | 
-Docker | https://www.docker.com | 
+Docker | https://www.docker.com | X
 Doist | https://doist.io | 
 DuckDuckGo | https://duckduckgo.com/ | 
 Emetech | http://www.emetech.net/ | 
-EngineYard (Support Team) | https://www.engineyard.com/ | 
+EngineYard (Support Team) | https://www.engineyard.com/ | X
 Estately | http://www.estately.com/ | 
 Etsy | https://www.etsy.com/ | 
 EVELO | https://evelo.workable.com | 
@@ -60,11 +60,11 @@ Eyeo | https://eyeo.com/ |
 Filament Group | https://www.filamentgroup.com/ | 
 Fire Engine Red | http://fire-engine-red.com/ | 
 Functionite | http://functionite.com/ | 
-General Assembly | http://generalassemb.ly | 
+General Assembly | http://generalassemb.ly | X
 Ghost | https://ghost.org/ | 
 Gitbook | https://www.gitbook.com/ | 
-GitHub | https://github.com/ | 
-GitLab | https://about.gitlab.com/ | 
+GitHub | https://github.com/ | X
+GitLab | https://about.gitlab.com/ | X
 Glue Networks | http://gluenetworks.com/ | 
 Google | https://www.google.com/ | 
 GotSoccer, LLC | http://www.gotsoccerpro.com | 
@@ -74,7 +74,7 @@ HashiCorp | https://www.hashicorp.com/ |
 Healthfinch | http://www.healthfinch.com/ | 
 Heap | https://heapanalytics.com/ | 
 Helpscout | http://www.helpscout.net/ | 
-Heroku | https://www.heroku.com/ | 
+Heroku | https://www.heroku.com/ | X
 Honeybadger | https://www.honeybadger.io/ | 
 Hugo | https://hugo.homerun.hr | 
 IBM | http://www.ibm.com/ | 
@@ -86,8 +86,8 @@ Interpersonal Frequency (I.F.) | 8 |
 InVision | http://www.invisionapp.com/ | 
 IPS Group, Inc. | 2 | 
 iwantmyname | https://iwantmyname.com/ | 
-Keen IO | https://keen.io/ | 
-Khan Academy | https://www.khanacademy.org/ | 
+Keen IO | https://keen.io/ | X
+Khan Academy | https://www.khanacademy.org/ | X
 KickBack Rewards Systems | http://careers.kickbacksystems.com | 
 LaterPay | https://www.laterpay.net/ | 
 Librato | https://www.librato.com/ | 
@@ -101,7 +101,7 @@ Memberful | https://memberful.com |
 MetaLab | http://metalab.co | 
 Mokriya | http://mokriya.com | 
 Mokriya Inc | http://www.mokriya.com | 
-Mozilla | https://www.mozilla.org/ | 
+Mozilla | https://www.mozilla.org/ | X
 Mycelium | https://mycelium.com | 
 Next Big Sound | https://www.nextbigsound.com/ | 
 NodeSource | https://nodesource.com/ | 
@@ -122,7 +122,7 @@ Railsdog | http://www.railsdog.com/ |
 RealHQ | http://www.realhq.com/ | 
 RebelMouse | https://www.rebelmouse.com/ | 
 Receiptful | https://receiptful.com | 
-Recurly | https://recurly.com/ | 
+Recurly | https://recurly.com/ | X
 Red Hat | http://www.redhat.com/ | 
 RedMonk | http://redmonk.com/ | 
 reinteractive | https://reinteractive.net/ | 
@@ -133,7 +133,7 @@ Sawhorse Media | http://sawhorsemedia.com |
 Scrapinghub | http://scrapinghub.com/ | 
 SecurityScorecard Inc.  | http://securityscorecard.com | 
 SignEasy | http://getsigneasy.com | 
-Simple | https://www.simple.com/ | 
+Simple | https://www.simple.com/ | X
 Skillshare  | http://bit.ly | 
 SmugMug | https://www.smugmug.com/ | 
 SoftwareMill | https://softwaremill.com/ | 
@@ -141,7 +141,7 @@ Soostone | http://www.soostone.com/ |
 Sqwiggle | https://www.sqwiggle.com/ | 
 StackExchange | http://stackexchange.com/ | 
 Stitch Fix  | https://www.stitchfix.com | 
-Stripe | https://stripe.com/ | 
+Stripe | https://stripe.com/ | X
 Strongloop | https://strongloop.com/ | 
 Surevine | https://www.surevine.com/ | 
 Sutherland Global Services - CloudSource  | https://www.sutherlandcloudsource.com | 
@@ -153,29 +153,29 @@ TED | https://www.ted.com/ |
 Teleport | http://teleport.org/ | 
 Telerik | http://www.telerik.com/ | 
 Tenable | http://www.tenable.com/ | 
-Test Double | http://testdouble.com/ | 
+Test Double | http://testdouble.com/ | X
 The Grid | https://thegrid.io/ | 
 The Publisher Desk | http://www.publisherdesk.com | 
 The Remote Lab | http://theremotelab.io | 
 ThreatSim | http://threatsim.com/ | 
 toggl | https://toggl.com/ | 
 Toptal | http://www.toptal.com/ | 
-Travis CI | https://travis-ci.org/ | 
-Treehouse | https://teamtreehouse.com/ | 
+Travis CI | https://travis-ci.org/ | X
+Treehouse | https://teamtreehouse.com/ | X
 Trello | https://trello.com/ | 
 Tribe | http://www.tribe.net/welcome | 
 Twin Technologies | https://www.twintechs.com/ | 
 UpTrending | http://uptrending.com | 
 Upwork Pro | https://pro.upwork.com | 
-Vox Media (Product Team) | http://www.voxmedia.com/ | 
+Vox Media (Product Team) | http://www.voxmedia.com/ | X
 WebDevStudios | https://webdevstudios.com/ | 
 WellMatch | https://wellmatchhealth.com/ | 
 Whitecap SEO | 7 | 
 Whitespectre | http://whitespectre.com | 
 WikiHow | http://www.wikihow.com/wikiHow:About-wikiHow | 
-Wikimedia | https://commons.wikimedia.org/wiki/Main_Page | 
+Wikimedia | https://commons.wikimedia.org/wiki/Main_Page | X
 Word to the Wise | https://wordtothewise.com | 
 Wordpress | https://wordpress.com/ | 
 X-Team | http://x-team.com/ | 
 YouCanBook.me Ltd | https://youcanbook.me | 
-Zapier | https://zapier.com/ | 
+Zapier | https://zapier.com/ | X