ASDF
Merge branch 'master' of https://github.com/kenleezle/WACR

Conflicts:
	client.js