h
Merge branch 'develop' of https://github.com/marshallcoz/libem-2d into develop

Conflicts:
making sh
Merge branch 'slowsh' of https://github.com/marshallcoz/libem-2d into develop