display gamma beta for debug
Merge branch 'master' of https://github.com/shrig94/pokemon

Conflicts:
	client/view/index.html
fixed conflict