 
 (add-to-list 'load-path "~/.emacs.d/elpa/htmlize")
 (require 'htmlize)
+
+(require 'smooth-scrolling)
 
 (add-to-list 'load-path "~/.emacs.d/elpa/aggressive-indent")
 (require 'aggressive-indent)


;;-------------------------------------Server------------------
(require 'server)
;; Start a server if (server-running-p) does not return t (e.g. if it
;; returns nil or :other)
(or (eq (server-running-p) t)
    (server-start))
;;-------------------------------------Server------------------


   (quote
    (org flyspell-popup flyspell-correct evil flycheck rainbow-mode yasnippet solarized-theme emmet-mode)))
 '(powerline-height nil)
<<<<<<< HEAD
 '(python-shell-exec-path (quote ("C:/Python27")))
 '(python-shell-prompt-detect-failure-warning t)
 '(python-shell-virtualenv-root nil)
 '(ring-bell-function (quote ignore))
=======
 '(ring-bell-function (quote ignore) t)
 '(scroll-restore-mode t)
>>>>>>> 467ab7c... Added smooth scrolling mode
 '(send-mail-function (quote mailclient-send-it))
 '(show-paren-mode t)
 '(smooth-scroll-margin 15)
 '(smooth-scrolling-mode t)
 '(solarized-distinct-doc-face nil)
 '(solarized-use-variable-pitch nil)
 '(standard-indent 2)
