Cleaning up code
Merge remote-tracking branch 'origin/master' into refactor

Conflicts:
	Gemfile
	functions.rb
Lock ruby version