Test of resolving
Merge branch 'master' of https://github.com/tigmnmann/distribution

Conflicts:
	idatatable.hpp