commit
commit
Merge branch 'master' of http://github.com/epoxy/Datastrukt
commit
fixed conflicts