-
Merge branch 'master' of https://github.com/Weyker/envialo

Conflicts:
	Gemfile.lock