# Conflicts:
#	Makefile
#	biocham_gui/package.json
#	biocham_gui/src/App.js
#	biocham_gui/src/main.js
#	library/examples/MPCE/ASSB.ipynb
#	library/examples/MPCE/clock.ipynb
#	library/examples/pac_learning_cmsb_2017/Lotka-Volterra.ipynb