Create index.html
Create style.css
Create script.js
Merge branch 'master' into test

Conflicts:
	test/index.html
	test/script.js
	test/style.css