diff --git a/.bashrc b/.bashrc
new file mode 100644
index 0000000..961110a
--- /dev/null
+++ b/.bashrc
@@ -0,0 +1,24 @@
+source ~/.git-completion.sh
+source ~/.git-prompt.sh
+
+export EDITOR=vim
+export WEBIDE_JDK=/usr/lib/jvm/java-1.7.0-openjdk-amd64
+
+GIT_PS1_SHOWDIRTYSTATE=1
+GIT_PS1_SHOWUNTRACKEDFILES=1
+GIT_PS1_SHOWUPSTREAM=verbose
+GIT_PS1_SHOWCOLORHINTS=1
+GIT_PS1_SHOWSTASHSTATE=1
+
+GREEN="\[\033[1;32m\]"
+BLUE="\[\033[1;34m\]"
+MAGENTA="\[\033[1;35m\]"
+YELLOW="\[\033[1;33m\]"
+RESET="\[\033[0m\]"
+
+function set_bash_prompt() {
+    PS1="$GREEN\u$RESET:$BLUE\w$MAGENTA$(__git_ps1 " (%s)")$YELLOW ⚡$RESET "
+}
+
+PROMPT_COMMAND=set_bash_prompt
+
diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..7f69d9f
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,8 @@
+set number
+set ts=4
+set ai
+set shiftwidth=4
+set expandtab
+set nowrap
+
+call pathogen#infect()