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