s
bundle update
Merge branch 'master' of github.com:PullRequestFive/dashboard

Conflicts:
	Gemfile.lock