gitignoreを修正
共有したくないフォルダをgit rm --cached
Merge remote-tracking branch 'origin/ignores'

Conflicts:
	cakephp/app/tmp/cache/cake_toolbar_cache
	cakephp/app/tmp/cache/models/myapp_cake_model_default_cake_list
	cakephp/app/tmp/cache/models/myapp_cake_model_default_cake_users
	cakephp/app/tmp/cache/persistent/myapp_cake_core_cake_dev_ja
	cakephp/app/tmp/cache/persistent/myapp_cake_core_cake_ja
	cakephp/app/tmp/cache/persistent/myapp_cake_core_debug_kit_ja
	cakephp/app/tmp/cache/persistent/myapp_cake_core_default_ja
	cakephp/app/tmp/cache/persistent/myapp_cake_core_file_map
	cakephp/app/tmp/cache/persistent/myapp_cake_core_method_cache
	cakephp/app/tmp/logs/error.log