removed bad user name
Merge branch 'master' of https://github.com/allenylzhou/pokerface

Conflicts:
	sql/all.sql
Merge branch 'master' of https://github.com/allenylzhou/pokerface
more checks