diff --git a/.gitignore b/.gitignore
index 894a44c..cd46aa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+###Git ignore file for MDStudio repository
+
+# This file is different per user
+data/settings.json
+
+### Python files
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -8,6 +14,7 @@ __pycache__/
 
 # Distribution / packaging
 .Python
+env/
 build/
 develop-eggs/
 dist/
@@ -19,18 +26,19 @@ lib64/
 parts/
 sdist/
 var/
-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
-MANIFEST
 
 # PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+# Usually these files are written by a python script from a template
+# before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec
 
+# Jupyter notebooks
+.ipynb_checkpoints
+
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt
@@ -43,62 +51,149 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
-*.cover
+*,cover
 .hypothesis/
-.pytest_cache/
 
 # Translations
 *.mo
 *.pot
 
-# Django stuff:
+# Sphinx documentation
+docs/_build/
+
+# Virtualenv en venv
+venv/
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+### OSX template
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Windows template
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+### Node template
+# Logs
+logs
 *.log
-local_settings.py
-db.sqlite3
+npm-debug.log*
 
-# Flask stuff:
-instance/
-.webassets-cache
+# Runtime data
+pids
+*.pid
+*.seed
 
-# Scrapy stuff:
-.scrapy
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
 
-# Sphinx documentation
-docs/_build/
+# Coverage directory used by tools like istanbul
+coverage
 
-# PyBuilder
-target/
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
 
-# Jupyter Notebook
-.ipynb_checkpoints
+# node-waf configuration
+.lock-wscript
 
-# pyenv
-.python-version
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
 
-# celery beat schedule file
-celerybeat-schedule
+# Dependency directory
+# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
+node_modules
 
-# SageMath parsed files
-*.sage.py
+# Docker
+docker/.INSTALLING
 
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+.idea
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
 
-# Spyder project settings
-.spyderproject
-.spyproject
+# IntelliJ
+/out/
 
-# Rope project settings
-.ropeproject
+# mpeltonen/sbt-idea plugin
+.idea_modules/
 
-# mkdocs documentation
-/site
+# JIRA plugin
+atlassian-ide-plugin.xml
 
-# mypy
-.mypy_cache/
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# files generated on merge conflicts
+*.orig
+
+# Ignore compiled typescript
+app/gulp/*.js
+app/gulp/*.map
+app/gulp/tasks/*.js
+app/gulp/tasks/*.map
+app/src/*.js
+app/src/**/*.map
+app/src/**/*.js
+app/gulpfile.js
+app/gulpfile.js.map
+app/bower_components/*
+components/*/data
+docker/.USERDONE
+/key.priv
+/key.pub
+
+# emacs
+*~
+
+# MDSTUDIO
+cerise_config.json
+venv
+.env
+**/.settings.*.yml