bundle update
Merge branch 'master' of github.com:icco/what

Conflicts:
	Gemfile.lock