removed duplicate files
merged

Merge branch 'master' of https://github.com/gekkonerd/hyrise