update
Merge branch 'master' of https://github.com/mwjcyber/Project10

Conflicts:
	src/Individual.java