querys
Merge branch 'master' of https://github.com/QuimFerrer/pinball

Conflicts:
	js/user.js