Merge pull request #130 from MikeHoffert/dev

Last minute fixes
KatrinaHoffert · Mar 23, 2015 · c79b623 · c79b623
2 parents 0aad6ef + e097fa0
commit c79b623
Show file tree

Hide file tree

Showing 30 changed files with 35,879 additions and 35,217 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,5 @@ nohup.out
 # Sublime-workspace files are user specific
 *.sublime-workspace
 *.classpath
+conf/routes
+conf/routes