yeah
cleaning
Merge branch 'master' into Brett69
Test for the adding of all tests
Merge branch 'Brett69'

Conflicts:
	test/bootstrap.c
cleaning
fixin'