Sodesuka?
conflict
Merge branch 'master' into Dustin

Conflicts:
	 index.html
Merge pull request #3 from BigKnell/Dustin

Dustin