resolved readme.m conflict to master

This commit is contained in:
g-spacewhale
2017-11-18 08:36:50 +01:00
23 changed files with 3870 additions and 3684 deletions

View File

@@ -1,4 +1,5 @@
bool next()
{