update
Merge branch 'master' of https://github.com/liuin/webstart

Conflicts:
	js/script.js