Merge branch 'testing' into otherTest

Conflicts:
	SampleSite/asdf.txt
Merge branch 'testing'

Conflicts:
	SampleSite/asdf.txt