Merge branch 'master' of dbgit.prakinf.tu-ilmenau.de:code/nvm-based_data_structures

Conflicts:
	README.md
3 jobs for master in 1 minute and 33 seconds (queued for 3 seconds)