fix: path
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	src/public/index.jade
fix: script load timing