modified:   .gitignore
Merge branch 'master' of github.com:zanjibar/patchworksID

Conflicts:
	.gitignore

	modified:   .gitignore
	modified:   2/name.ini
	modified:   2/patchworks_view_edit_item_2.html
	modified:   2/patchworks_view_main_init_2.html
	modified:   2/view_main_init.php
	modified:   3/name.ini
	deleted:    5/action_main_init.php
	modified:   5/name.ini
	renamed:    2/patchworks_view_edit_item_2.html -> 5/patchworks_view_edit_item_5.html
	renamed:    2/view_edit_item.php -> 5/view_edit_item.php
	renamed:    2/view_main_init.php -> 5/view_main_init.php
	new file:   6/action_main_init.php
	new file:   6/name.ini
	modified:   6/patchworks_view_main_init_6.html
	new file:   7/name.ini
	new file:   7/patchworks_view_edit_item_7.html
	modified:   7/patchworks_view_main_init_7.html
	new file:   7/view_edit_item.php
	modified:   7/view_main_init.php
	new file:   8/name.ini
	new file:   8/patchworks_view_edit_config_8.html
	new file:   8/patchworks_view_edit_item_8.html
	modified:   8/patchworks_view_main_init_8.html
	new file:   8/view_edit_item.php
modified:   8/view_main_init.php
	new file:   9/name.ini
	modified:   9/view_main_init.php
Merge branch 'master' of github.com:zanjibar/patchworksID
	modified:   5/view_main_init.php
未ログインエラーの回避

	modified:   view_main_init.php
	modified:   5/view_main_init.php
	modified:   action_main_init.php