diff --git a/README.md b/README.md
index 6394c60..b58aa4a 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,3 @@
 # My dotconfig files.
+---
+This is where i put my systems config. I hope someday it will be consistent. :sweat_smile:
diff --git a/emacs/init.el b/emacs/init.el
new file mode 100644
index 0000000..b5a05c6
--- /dev/null
+++ b/emacs/init.el
@@ -0,0 +1,52 @@
+(menu-bar-mode -1)
+(tool-bar-mode -1)
+(scroll-bar-mode -1)
+
+(require 'package)
+(setq package-enable-at-startup nil)
+
+(setq package-archives
+      '(("gnu"          . "https://elpa.gnu.org/packages/")
+        ("melpa"        . "https://melpa.org/packages/")
+        ("melpa-stable" . "https://stable.melpa.org/packages/")))
+
+(setq package-archive-priorities
+      '(("gnu"          . 10)
+        ("melpa"        . 20)
+        ("melpa-stable" . 0)))
+
+(package-initialize)
+
+;; Bootstrap 'use-package
+(unless (package-installed-p 'use-package)
+  (package-refresh-contents)
+  (package-install 'use-package))
+
+(eval-when-compile
+  (require 'use-package))
+(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-safe-themes
+   (quote
+    ("bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" default)))
+ '(package-selected-packages
+   (quote
+    (flycheck cyberpunk-theme dashboard geiser nim-mode spacemacs-theme use-package))))
+(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.
+ )
+
+(load-theme 'spacemacs-dark)
+(use-package dashboard
+  :ensure t
+  :config
+  (dashboard-setup-startup-hook))
+
+(setq dashboard-startup-banner 'logo)
+(add-hook 'after-init-hook #'global-flycheck-mode)
diff --git a/spawn-my-bashrc.sh b/spawn-my-bashrc.sh
index 8ffda58..95f96ad 100755
--- a/spawn-my-bashrc.sh
+++ b/spawn-my-bashrc.sh
@@ -48,11 +48,26 @@ ALERT=${BWhite}${On_Red} # Bold White on red background
 "
 
 ALIASES="
+<<<<<<< HEAD
 # Mostly used aliases
 alias ..=\"cd ..\"
 alias cd..=\"cd ..\"
 alias ls=\"ls -CF --color=auto\"
 alias myip=\"curl http://ipecho.net/plain; echo\"
+=======
+alias ..='cd ..'
+alias cd..='cd ..'
+alias ls='ls -CF --color=auto'
+alias ll='ls -lisa --color=auto'
+alias lsl='ls -lhFA | less'
+alias free='free -mth'
+alias ps='ps auxf'
+alias psgrep='ps aux | grep -v grep | grep -i -e VSZ -e'
+alias histg='history | grep'
+alias myip='curl http://ipecho.net/plain; echo'
+alias logs=\"find /var/log -type f -exec file {} \; | grep 'text' | cut -d' ' -f1 | sed -e's/:$//g' | grep -v '[0-9]$' | xargs tail -f\"
+alias cdo='cd -'
+>>>>>>> 2c6abfc47c0fba7334c835c403b15a21c399b564
 "
 
 # Avoid running these commands as super user