fixed merge conflict
created scoped views, added authentication for users and admins through devise, created admin model
removed pagination stuff
configured for bootstrap
added missing files
converted application.erb to slim
basic layout done.
added redcarpet and nokogiri gems
added html to concept for markdown
added migrate
added markdown to concept model and views