Gemfile
Merge branch 'master' of github.com:scalableinternetservices/Upvid

Conflicts:
	Gemfile