Finally have it close this time

Hope this wokrs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile