Merge branch 'master' of https://github.com/wu6522583/NightFury

Conflicts:
	index.html
	index.js
	web-info/css/global.css
	web-info/html/main.html
	web-info/js/main.js