test
Merge branch 'master' of github.com:IvanVP/glash

Conflicts:
	Gemfile.lock
Corrects users test