Merge branch 'dev'

Conflicts: README.md
eabdullin · Jan 5, 2016 · 4889906 · 4889906
2 parents a5b86f9 + 28f1990
commit 4889906
Show file tree

Hide file tree

Showing 48 changed files with 70,674 additions and 634 deletions.
diff --git a/.gitignore b/.gitignore
@@ -194,3 +194,4 @@ FakesAssemblies/
 
 # Visual Studio 6 workspace options file
 *.opt
+/Data/*.bin