Friendship
commit
Merge branch 'master' of https://github.com/git2rails/rails into branch01

Conflicts:
	app/controllers/api/api_controller.rb
	app/models/app.rb
	db/schema.rb
	test/fixtures/apps.yml
commit