last changes
Merge remote-tracking branch 'origin/users_2' into user
Connected users
Merge branch 'master' into user

Conflicts:
	Gruntfile.js
Adding number to displayed guess name
Adding number to displayed guess name
Remove Gruntfile.js.orig
Merge pull request #3 from mapale/user

User