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

Conflicts:
	Gemfile.lock
Merge branch 'master' of github.com:icco/inspiration