Update
lala
Merge branch 'master' of github.com:Shelvak/x0y0

Conflicts:
	Gemfile
	Gemfile.lock