small changes
small

Merge branch 'master' of https://github.com/Gunners101/thss

Conflicts:
	main_optimiser.R
small