From f4e4eeb58854266795f19b8d52ab793ce54c5a7a Mon Sep 17 00:00:00 2001
From: Eric <rasliche@gmail.com>
Date: Thu, 16 Jan 2020 19:28:42 -0500
Subject: [PATCH] Fix merge conflicts and catch up to awesome-uses:master
 (#425)

* Add @rasliche's /uses page

* Update data.js

* Eric Data
---
 src/data.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/data.js b/src/data.js
index 0130a6af..eae32e06 100644
--- a/src/data.js
+++ b/src/data.js
@@ -21,6 +21,28 @@ export default [
       'CSS',
     ],
   },
+  {
+    name: 'Eric Raslich',
+    description:
+      'Boat captain, web developer, marine biologist, solving science and communication problems with web technologies.',
+    url: 'https://ericraslich.com/uses',
+    twitter: '@rasliche',
+    emoji: '🤙',
+    country: '🇺🇸',
+    computer: 'apple',
+    phone: 'iphone',
+    tags: [
+      'Developer',
+      'Full Stack',
+      'Captain',
+      'Streamer',
+      'JavaScript',
+      'Vue',
+      'Node',
+      'CSS',
+      'Tailwind',
+      'Entrepreneur',]
+  },
   {
     name: 'Eliezer Steinbock',
     description: