Merge branch 'dev' of github.com:alin-ciobanu/bets into dev

Conflicts:
	package.json
header styling
Merge branch 'dev' of github.com:alin-ciobanu/bets into dev

Conflicts:
	client/style/style.css
min
bug userInfo
Merge branch 'dev'

Conflicts:
	Gruntfile.js