Change Test
Merge branch 'master' of https://github.com/Swarthmore/SEED_test

Conflicts:
	page_6.html