Added gemset configuration
Merge branch 'master' of github.com:zamakkat/challenge
Used wildcard for user
Merge branch 'master' of github.com:zamakkat/challenge

Conflicts:
	config/database.yml