width and height fixed
back to old width and height
Merge branch 'master' of https://github.com/lightsgoout/starbros
Merge branch 'master' of https://github.com/lightsgoout/starbros
close button
delete this shit
Merge branch 'master' of https://github.com/lightsgoout/starbros

Conflicts:
	client/index.html
	client/js/System.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
parsing params