Commit 00a7aa6c authored by Philipp Götze's avatar Philipp Götze

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

Conflicts:
	README.md
parents 58d93ce4 0b627b9b
Pipeline #351 failed with stages
in 1 minute and 33 seconds