diff --git a/.gitignore b/.gitignore
index 0398eb0..b535265 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # The directory Mix will write compiled artifacts to.
 /_build/
 
@@ -32,3 +33,12 @@ bump-*.tar
 npm-debug.log
 /assets/node_modules/
 
+# erlang compiler file
+*.beam
+
+# elixir language server file
+.elixir_ls/
+
+# secret information
+/config/*.secret.exs
+
diff --git a/README.md b/README.md
index d602f3b..9245216 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,9 @@
-# Bump
+# Bump Server
+
+Bump Server is an elixir based rest server that is used to communicate messages between clients
+
+
+# Setup
 
 To start your Phoenix server: