Merge branch 'master' of https://github.com/nafSadh/scire

Conflicts:
	scire/struct/container.hpp