fix redme conflict

README.md

@@ -13,7 +13,6 @@ Name | Website | Region
 [17hats](/company-profiles/17hats.md) | https://www.17hats.com/ | Worldwide
 [18F](/company-profiles/18F.md) | https://18f.gsa.gov/ | US
 [Acquia](/company-profiles/acquia.md) | http://www.acquia.com/ | Worldwide
-Aha | http://www.aha.io/ | US
 AngularClass | https://angularclass.com | PST Timezone
 [apartment therapy](/company-profiles/apartmenttherapy.md) | http://www.apartmenttherapy.com/ | US
 [Appstractor Corporation](company-profiles/appstractor.md) | http://www.appstractor.com | US, UK, Israel
@@ -132,6 +131,7 @@ Interpersonal Frequency (I.F.) | https://ifsight.com/ |
 InVision | http://www.invisionapp.com/ |
 IPS Group, Inc. |  http://www.ipsgroupinc.com/ |
 [iwantmyname](/company-profiles/iwantmyname.md) | https://iwantmyname.com/ | Worldwide
+[Jackson River](/company-profiles/jackson-river.md) | http://jacksonriver.com/ | US
 Jolly Good Code | http://www.jollygoodcode.com |
 Keen IO | https://keen.io/ |
 Khan Academy | https://www.khanacademy.org/ |
@@ -154,7 +154,6 @@ Memberful | https://memberful.com |
 MetaLab | http://metalab.co |
 Mixcloud | https://www.mixcloud.com/ |
 Mokriya | http://mokriya.com |
-Mokriya Inc | http://mokriya.com/ |
 Mozilla | https://www.mozilla.org/ |
 Mycelium | https://mycelium.com |
 MySQL | https://www.mysql.com/ |
@@ -180,7 +179,6 @@ PhishMe, Inc | http://phishme.com |
 Precision Nutrition | http://www.precisionnutrition.com/ |
 PreviousNext | https://www.previousnext.com.au/ |
 [Puppet Labs](/company-profiles/puppetlabs.md) | https://puppetlabs.com/ | NA, APAC, EMEA
-Railsdog | http://www.railsdog.com/ |
 Rainforest QA | https://www.rainforestqa.com/jobs/ |
 RealHQ | http://realhq.com/ |
 RebelMouse | https://www.rebelmouse.com/ |
@@ -211,7 +209,7 @@ Sqwiggle | https://www.sqwiggle.com/ |
 Stitch Fix  | https://www.stitchfix.com |
 [Stripe](/company-profiles/stripe.md) | https://stripe.com/ | Worldwide
 Strongloop | https://strongloop.com/ |
-SupportBee | https://supportbee.com/ | Worldwide
+[StudySoup](/company-profiles/studysoup.md) | https://studysoup.com/ | Worldwide
 Surevine | https://www.surevine.com/ |
 SUSE | https://www.suse.com/ | Worldwide
 Sutherland Global Services - CloudSource  | https://www.sutherlandcloudsource.com |

company-profiles/heap.md

@@ -0,0 +1,31 @@
+# Heap
+
+## Company blurb
+
+Heap is building analytics infrastructure for the web. Our goal is to make data science accessible to every online business. Our product help 3,000+ companies make data-driven decisions about their users.
+
+## Company size
+
+~25. [Meet us!](https://heapanalytics.com/about)
+
+## Remote status
+
+We care about hiring the best engineers, no matter where they live. Our engineers live all around the world: Estonia, Australia, Canada, Austin TX, Orange County CA, and San Francisco CA.
+
+We also have a writing-heavy culture, which lends itself well to remote work. Instead of sitting in meetings, we develop our ideas in writing, asynchronously. We think written proposals encourage clearer thought and more thorough deliberation. A useful side-effect is that our plans are always documented.
+
+## Region
+
+We hire engineers worldwide.
+
+## Company technologies
+
+Our app-layer stack is TypeScript, Backbone, Marionette, Node.js, Redis, and PostgreSQL. Under the hood, Heap is powered by CoffeeScript, Scala, ZooKeeper, Kafka, Akka, and CitusDB.
+
+## Office Locations
+
+San Francisco, CA, USA
+
+## How to apply
+
+Fill out the form at the bottom of our [job post](https://heapanalytics.com/jobs#engineer).

company-profiles/jackson-river.md

@@ -0,0 +1,29 @@
+# Jackson River
+
+## Company blurb
+
+Jackson River provides web technology services including Drupal development, Salesforce integration, and the company's own web platform, [Springboard](http://jacksonriver.com/springboard).
+
+## Company size
+
+20-30
+
+## Remote status
+
+Jackson River was built around remote working. The blog post "[How To Be A Virtual Company](http://jacksonriver.com/news/how-be-virtual-company)" describes the company's culture in detail.
+
+## Region
+
+Jackson River currently only has US-based employees.
+
+## Company technologies
+
+Apache, MySQL, PHP, Drupal, HTML, CSS, JavaScript.
+
+## Office Locations
+
+Washington, DC.
+
+## How to apply
+
+See the [jobs page](http://jacksonriver.com/about/jobs) for available positions.

company-profiles/studysoup.md

@@ -0,0 +1,45 @@
+# StudySoup
+
+## Company blurb
+
+[StudySoup](https://studysoup.com) is a peer-to-peer marketplace that enables students to buy and sell the study materials they need to succeed.
+
+## Company size
+
+0-20 full-time employees
+2,000+ student notetakers
+
+## Remote status
+
+StudySoup has headquarters in San Francisco, but only two full-time employees work there regularly.
+The rest of us work from various parts of California, Utah, Oregon, and Toronto.
+On top of that, we have thousands of student-notetakers spread across campuses nationwide.
+
+## Region
+
+Both full-time employees and student notetakers are spread worldwide.
+
+## Company technologies
+
+###For Remote Working:
+
+Slack
+Google Docs
+Google Hangouts
+
+###Other:
+
+Ruby-on-Rails
+MySQL
+Javascript/jQuery
+Zoho
+Stripe
+SendWithUs
+
+## Office Locations
+
+1381 9th Ave, San Francisco, CA 94122
+
+## How to apply
+
+https://studysoup.com/apply