Changes final
Merge branch 'master' of https://github.com/ruojia/ddos_2

Conflicts:
	hand.html
	network.html
	provider.html