updating Gemfile
Merge branch 'master' of github.com:krames/sxsw-demo-app

Conflicts:
	Gemfile