Test page for the site
Merge branch 'master' into test

Conflicts:
	test/index.html
	test/script.js
	test/style.css
Merge pull request #2 from HackYSU/test

Test page for the site