update scroll button
Merge branch 'master' of https://github.com/XDDDDD/xd

Conflicts:
	public/style/hackathon.css
commit again
update
:) fix conflict