Merge branch 'master' of edugit.org:Teckids/BiscuIT/BiscuIT-ng

.editorconfig

+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.py]
+indent_style = space
+indent_size = 4
+
+[*.html]
+file_type_emacs = jinja2
+indent_style = space
+indent_size = 2

.gitignore

@@ -46,6 +46,7 @@ ENV/
 # Editors
 *~
 DEADJOE
+\#*#
 
 # Database
 db.sqlite3