update README.md so it doesn't conflict

This commit is contained in:
Matjaž Finžgar
2017-04-04 16:06:27 +02:00
2 changed files with 1120 additions and 1068 deletions

2158
README.md

File diff suppressed because it is too large Load Diff