From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Tue, 2 Feb 2016 16:03:19 +0000 (+0100)
Subject: Merge branch 'master' of github.com:mpeuster/son-emu
X-Git-Tag: v3.1~185^2
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=7303abc38b4751466953c8db55815c63df6687ac;hp=64269198c6f0a11247af10a20f437d92ac33d02e

Merge branch 'master' of github.com:mpeuster/son-emu
---

diff --git a/.gitignore b/.gitignore
index ba74660..5cbc2c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+*$py.class
+
 
 # C extensions
 *.so
@@ -42,6 +44,7 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *,cover
+.hypothesis/
 
 # Translations
 *.mo
@@ -55,3 +58,7 @@ docs/_build/
 
 # PyBuilder
 target/
+
+#Ipython Notebook
+.ipynb_checkpoints
+
diff --git a/README.md b/README.md
index a6b4e5d..6309f7c 100644
--- a/README.md
+++ b/README.md
@@ -84,3 +84,4 @@ Automatic installation is provide through an Ansible playbook.
  * Stop compute
 * Create an Ansible-based automatic installation routine
 * Unit tests
+