progress on scoring functions
Merge branch 'master' of https://github.com/nbethel/BootcampConservationThing

Conflicts:
	main.py