Initial commit
Merge branch 'master' of github.bath.ac.uk:dsd28/UoB-mixture

Signed-off-by: Dan Dineen <dsd28@bath.ac.uk>

Conflicts:
	README.md
Merge branch 'master' of github.com:bathweb/Uob-mixture

Signed-off-by: Dan Dineen <dsd28@bath.ac.uk>

Conflicts:
	README.md