Merge remote-tracking branch 'origin/master'

imCodePartnerAB · Nov 28, 2016 · 1fdb172 · 1fdb172
2 parents 617c248 + 2ecefb5
commit 1fdb172
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,5 @@
+# iVIS
+The innovative Business system in the School
+
+Detailed information at http://ivis.se.
+Documents are placed at http://docs.ivis.se.
diff --git a/iVIS.iml b/iVIS.iml