Merge branch 'master' of https://github.com/strin/DeepBayes

Conflicts:
	RBM/rbm.py
Merge branch 'master' of https://github.com/strin/DeepBayes

Conflicts:
	RBM/rbm.py