fix merge conflict

README.md

@@ -8,7 +8,7 @@ Fork the repo to your account by clicking the button on the top right as shown i
 
 ![fork](https://cldup.com/vOF0oaUkh5-3000x3000.png) and then where you want to fork it as shown below.
 
-![fork-repo](https://cldup.com/QMGPJDlayN-3000x3000.png)
+<img src="https://cldup.com/QMGPJDlayN-3000x3000.png" height="300" width="300">
 
 Next, Go the the project settings and change the repository name to `<username>.github.io` where username is your username.
 
@@ -107,3 +107,5 @@ concat: {
 * Homepage: http://vinitkumar.me
 * e-mail: vinit1414.08@bitmesra.ac.in
 * Twitter: [@vinitkme](https://twitter.com/vinitkme "vinitkme on twitter")
+
+<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/uyhQ2YHmpDTZbNRraFXJEvTa/vinitkumar/white-paper'>  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/uyhQ2YHmpDTZbNRraFXJEvTa/vinitkumar/white-paper.svg' /></a>

_config.yml

@@ -17,6 +17,7 @@ paginate: 4
 logo:             logo.png
 disqus_shortname:
 
+rtl: false
 owner:
   name:           whitepaper
   avatar:         "https://avatars1.githubusercontent.com/u/537678?s=240&v=4"

_includes/footer.html

@@ -12,18 +12,18 @@
     <a href="{{ site.owner.github }}" class="social-media-icons"><i class="fa fa-2x fa-github-square" aria-hidden="true"></i></a>
   {% endif %}  
   {% if paginator.next_page %}
-    <a href="{{site.url}}/page{{paginator.next_page}}" class="older"><span class="mega-octicon octicon-playback-rewind" style="min-width: 32px;"></span></a>
+    <a href="{{site.url}}/page{{paginator.next_page}}" class="older"><span class="mega-octicon octicon-playback-{% if site.rtl %}fast-forward{% else %}rewind{% endif %}" style="min-width: 32px;"></span></a>
   {% else %}
-    <span class="next"><span class="mega-octicon octicon-playback-rewind" style="min-width: 32px;"></span></span>
+    <span class="next"><span class="mega-octicon octicon-playback-{% if site.rtl %}fast-forward{% else %}rewind{% endif %}" style="min-width: 32px;"></span></span>
   {% endif %}
   {% if paginator.previous_page %}
     {% if paginator.page == 2 %}
-      <a href="{{site.url}}/" class="newer"><span class="mega-octicon octicon-playback-fast-forward" style="min-width: 32px;"></span></a>
+      <a href="{{site.url}}/" class="newer"><span class="mega-octicon octicon-playback-{% if site.rtl %}rewind{% else %}fast-forward{% endif %}" style="min-width: 32px;"></span></a>
     {% else %}
-      <a href="{{site.url}}/page{{paginator.previous_page}}" class="newer"><span class="mega-octicon octicon-playback-fast-forward" style="min-width: 32px;"></span></a>
+      <a href="{{site.url}}/page{{paginator.previous_page}}" class="newer"><span class="mega-octicon octicon-playback-{% if site.rtl %}rewind{% else %}fast-forward{% endif %}" style="min-width: 32px;"></span></a>
     {% endif %}
   {% else %}
-    <span class="previous"><span class="mega-octicon octicon-playback-fast-forward" style="min-width: 32px;"></span></span>
+    <span class="previous"><span class="mega-octicon octicon-playback-{% if site.rtl %}rewind{% else %}fast-forward{% endif %}" style="min-width: 32px;"></span></span>
   {% endif %}
 </div>
 {%  endif %}

_includes/head.html

@@ -25,4 +25,16 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <link rel="stylesheet" href="{{ '/css/font-awesome.min.css' | relative_url }}">
-<link rel="stylesheet" href="{{ '/css/main.min.css' | relative_url }}" type="text/css" />
+<link rel="stylesheet" href="{{ '/css/main.min.css' | relative_url }}" type="text/css" />
+
+
+{% if site.rtl %}
+<link rel="stylesheet" href=" {{ '/css/main.min.rtl.css' | relative_url }}" type="text/css" />
+<style>
+    .highlight pre {
+        direction: ltr;
+    }
+</style>
+{% else %}
+<link rel="stylesheet" href=" {{ '/css/main.min.css' | relative_url }}" type="text/css" />
+{% endif %}

_includes/header.html

@@ -2,10 +2,10 @@
   <header>
       <ul class="nav">
         <!--Change the  URL here if working on an absolute domain-->
-        <li><a href="{{ site.url }}"><i class="fa fa-home" aria-hidden="true" style="margin-right: 6px;"></i>Home</a></li>
-        <li><a href="{{ site.url }}/about"><i class="fa fa-user" aria-hidden="true" style="margin-right: 6px;"></i>About</a></li>
-        <li><a href="{{ site.owner.github }}" target="_blank"><i class="fa fa-terminal" aria-hidden="true" style="margin-right: 6px;"></i>Projects</a></li>
-        <li><a href="{{ site.url }}/feed.xml"><i class="fa fa-rss" aria-hidden="true" style="margin-right: 6px;"></i>RSS</a></li>        
+        <li><a href="{{ site.url }}"><i class="fa fa-home" aria-hidden="true" style="margin-{% if site.rtl %}left{% else %}right{% endif %}: 6px;"></i>Home</a></li>
+        <li><a href="{{ site.url }}/about"><i class="fa fa-user" aria-hidden="true" style="margin-{% if site.rtl %}left{% else %}right{% endif %}: 6px;"></i>About</a></li>
+        <li><a href="{{ site.owner.github }}" target="_blank"><i class="fa fa-terminal" aria-hidden="true" style="margin-{% if site.rtl %}left{% else %}right{% endif %}: 6px;"></i>Projects</a></li>
+        <li><a href="{{ site.url }}/feed.xml"><i class="fa fa-rss" aria-hidden="true" style="margin-{% if site.rtl %}left{% else %}right{% endif %}: 6px;"></i>RSS</a></li>
       </ul>
   </header>
 </div>

_layouts/default.html

@@ -1,5 +1,9 @@
 <!DOCTYPE html>
+{% if site.rtl %}
+<html dir="rtl">
+{% else %}
 <html>
+{% endif %}
 <head>
   {% include head.html %}
 </head>