fix merge conflict

README.md

@@ -60,8 +60,8 @@ for the configuration we use on Retrospring.
 
 #### Configure It
 
-    # Change into the justask directory
-    $ cd justask
+    # Change into the project directory
+    $ cd retrospring
 
     # Copy the example config
     $ cp config/justask.yml.example config/justask.yml

app/assets/stylesheets/scss/navbar.scss

@@ -133,7 +133,7 @@
   border: none;
 }
 
-@media (min-width: 768px) {
+@media (min-width: 769px) {
   nav.navbar .nav > li:not(.profile--image-dropdown) {
     -moz-osx-font-smoothing: grayscale;
     position: relative;

app/controllers/ajax/question_controller.rb

@@ -86,7 +86,7 @@ class Ajax::QuestionController < ApplicationController
 
     @message = I18n.t('messages.question.preview.fail')
     begin
-      @markdown = markdown(params[:md], Time.new)
+      @markdown = markdown params[:md]
       @message = I18n.t('messages.question.preview.okay')
     rescue
       @status = :fail