diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..484a12c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+end_of_line = lf
+
+[*.{js,ts,tsx,jsx,css,scss,html,json,yml,yaml,md}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+max_line_length = off
diff --git a/components/blog/blog.tsx b/components/blog/blog.tsx
index 82d7886..941ac83 100644
--- a/components/blog/blog.tsx
+++ b/components/blog/blog.tsx
@@ -11,6 +11,7 @@ import { Hero } from './sections/hero';
 import Comments from '../comments';
 
 import './blog.scss'; // TODO: This styles will be global even only imported here. We should
+import Link from 'next/link';
 
 type Props = {
   blogPostItem: BlogPostItem;
@@ -21,7 +22,6 @@ type Props = {
 export function Blog({ blogPostItem, dictionary, lang }: Props) {
   const host = `https://gironajs.com`; // TODO: Put host value on environment variables
   const getFullHref = (post: BlogPostItem) => `${host}/${post.urlPath}`;
-
   return (
     <div>
       <Hero {...blogPostItem.data} />
@@ -34,13 +34,26 @@ export function Blog({ blogPostItem, dictionary, lang }: Props) {
         </div>
 
         <hr></hr>
-        <div className="flex items-center justify-between my-4">
-          <span>{dictionary.blog.sharePost}</span>
-          <SocialShareButtons
-            url={getFullHref(blogPostItem)}
-            title={blogPostItem.data.title}
-          />
+
+        <div className="my-4">
+          <p>
+            {dictionary.blog.edit_github}
+            <Link
+              className="underline underline-offset-4"
+              href={`https://github.com/gironajs/gironajs.com/tree/main/blog/${lang}/${blogPostItem.id}_${blogPostItem.filePath}`}
+            >
+              {dictionary.blog.edit_github_link}
+            </Link>
+          </p>
+          <div className="flex items-center justify-between my-4">
+            <span>{dictionary.blog.sharePost}</span>
+            <SocialShareButtons
+              url={getFullHref(blogPostItem)}
+              title={blogPostItem.data.title}
+            />
+          </div>
         </div>
+
         <Comments lang={lang} />
       </div>
     </div>
diff --git a/config/member.ts b/config/member.ts
index caae915..99f82d5 100644
--- a/config/member.ts
+++ b/config/member.ts
@@ -58,6 +58,14 @@ const members: Member[] = [
     company: 'Nexus Geographics',
     linkedin: 'carles-piqueras-carreras',
   },
+  {
+    github: 'biels',
+    name: 'Biel Simon',
+    role: 'Senior Javascipt Engineer',
+    company: 'UserTesting',
+    twitter: 'biel_simon',
+    linkedin: 'biel-simon-16554760',
+  },
 ];
 
 const membersDictionary: Dictionary<Member> = members.reduce(
diff --git a/dictionaries/ca.json b/dictionaries/ca.json
index c25ee04..914b105 100644
--- a/dictionaries/ca.json
+++ b/dictionaries/ca.json
@@ -38,7 +38,9 @@
     "sharePost": "T'ha agradat el post? Si us plau, comparteix-lo",
     "title": "Blog",
     "subtitle_1": "Aquí pots trobar totes les entrades del blog publicades per GironaJS",
-    "subtitle_2": "Qualsevol contribució és benvinguda, així que si vols escriure una entrada, si us plau, contacta'ns!"
+    "subtitle_2": "Qualsevol contribució és benvinguda, així que si vols escriure una entrada, si us plau, contacta'ns!",
+    "edit_github": "Has trobat una errada? ",
+    "edit_github_link": "Edita-la al Github"
   },
   "map": {
     "title": "GironaJS - Mapa 3D de la ciutat",
diff --git a/dictionaries/en.json b/dictionaries/en.json
index 41f06a5..e6bedc2 100644
--- a/dictionaries/en.json
+++ b/dictionaries/en.json
@@ -38,7 +38,9 @@
     "sharePost": "Did you like the post? Please share it",
     "title": "Blog posts",
     "subtitle_1": "Here you can find all the blog posts published by GironaJS",
-    "subtitle_2": "Any contribution is welcome, so if you want to write a post, please contact us!"
+    "subtitle_2": "Any contribution is welcome, so if you want to write a post, please contact us!",
+    "edit_github": "Have you found a mistake? ",
+    "edit_github_link": "Edit it on Github!"
   },
   "map": {
     "title": "GironaJS - 3D City Map",