merged in from code from the other master

[selectricity] / .gitignore

diff --git a/.gitignore b/.gitignore
index 481f955ecc01c463def96ec5b3ad470ddb2b0c61..b231fb40c44abebe580ef48caa205b4682389410 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*~
+*.swp
 database.yml
 tmp
 public/engine_files