Dual Test Steve C

Testing to see how this dual sync works
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/test.html