Updated environment and bundles
Merge branch 'master' of https://github.com/icsvortex666/fromzerotohero.co

Conflicts:
	Gemfile.lock