buy
Merge branch 'master' of https://github.com/Ukiebook/ukiebook

Conflicts:
	config/routes.rb