Added gems binding_of_caller and better_errors
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile