First commit
Merge branch 'master' of https://github.com/kyle5/unified_sampling