ok
ok

Merge branch 'master' of ghb:netw0rm/Dota-Web

Conflicts:
	README.md