my comment
Merge branch 'master' of github.com:okinoz/sample_app

Conflicts:
	db/schema.rb
Merge branch 'master' of github.com:okinoz/sample_app
Merge branch 'master' of github.com:okinoz/sample_app
my comment
Merge branch 'master' of github.com:okinoz/sample_app