diff --git a/emacs/emacs b/emacs/emacs
new file mode 100644
index 0000000..9c47bf6
--- /dev/null
+++ b/emacs/emacs
@@ -0,0 +1,52 @@
+(require 'package)
+;;; either the stable version:
+(add-to-list 'package-archives
+	     ;; choose either the stable or the latest git version:
+	     ;; '("melpa-stable" . "http://melpa-stable.org/packages/")
+	     '("melpa-unstable" . "http://melpa.org/packages/"))
+
+;; Added by Package.el.  This must come before configurations of
+;; installed packages.  Don't delete this line.  If you don't want it,
+;; just comment it out by adding a semicolon to the start of the line.
+;; You may delete these explanatory comments.
+(package-initialize)
+
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(custom-enabled-themes (quote (mustang)))
+ '(custom-safe-themes
+   (quote
+    ("6c0a087a4f49c04d4002393ffd149672f70e4ab38d69bbe8b39059b61682b61c" default)))
+ '(inhibit-startup-screen t)
+ '(package-selected-packages
+   (quote
+    (fill-column-indicator evil mustang-theme cider ## minimap))))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ )
+
+(menu-bar-mode 0)
+(tool-bar-mode 0)
+
+(add-to-list 'load-path "~/.emacs.d/evil")
+(require 'evil)
+(evil-mode 1)
+
+(require 'goto-last-change)
+
+(show-paren-mode 1)
+
+(require 'whitespace)
+(setq whitespace-style '(face empty tabs lines-tail trailing))
+(global-whitespace-mode t)
+
+(require 'fill-column-indicator)
+(setq-default fill-column 80)
+(define-globalized-minor-mode global-fci-mode fci-mode (lambda () (fci-mode 1)))  
+(global-fci-mode 1)