adding HealthRecord
create shop and category
Merge pull request #1 from tikkss/health_record

adding HealthRecord
Merge branch 'master' of github.com:tikkss/tsuwari into food

Conflicts:
	config/routes.rb
	db/schema.rb
use simplecov.
solve conflict
Merge pull request #3 from tikkss/shop

create shop and category
Merge branch 'master' of https://github.com/tikkss/tsuwari into simplecov

Conflicts:
	.gitignore
	Gemfile.lock
Merge pull request #4 from tikkss/simplecov

Simplecov
Merge branch 'master' of github.com:tikkss/tsuwari into food

Conflicts:
	config/routes.rb
	db/schema.rb
test.
removed garbage.
modified. 関連問題
Merge branch 'master' of github.com:tikkss/tsuwari
Fix for accepts_nested_attributes.
Fixed. foods/edit, new の view spec エラー修正