a
Merge branch 'master' of https://github.com/anxsaiyuki/r-web

Conflicts:
	db/migrate/20140429064454_create_products.rb
	db/migrate/20140429085208_create_products.rb
	db/migrate/20140429092858_create_products.rb
	db/schema.rb
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
Merge branch 'master' of https://github.com/anxsaiyuki/r-web
d