Silly change for pull request test.
Fix indentation.
Change scripts indentation slightly.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
Merge pull request #2 from Kashomon/master

Fix indentation