glow times
Merge branch 'refs/heads/master' into josh

Conflicts:
	style.css
Merge pull request #14 from htakahashi/josh

Josh