diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..0cf7afc959
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+.*swp
+*~
+application/logs/*
+application/cache/*
+media/uploads/*
+application/config/config.php
+application/config/database.php
\ No newline at end of file