attemtp to fix testing.shtml issue
Merge branch 'master' into gpio_test

Conflicts:
	htdocs/primes.shtml