merge
merge
small changes to select scripts
Merge branch 'master' of github.com:larsbratholm/cs-proteins

Conflicts:
	scripts/combine_muninn.sh
	scripts/get_cluster_rmsd.sh
	scripts/plot_reweighted_hist.sh
new proteins