from public html
Merge branch 'master' of github.com:chrisjyap/LoLLookup

Conflicts:
	client.js