CHANGE
change
change
touroku.php
Merge branch 'master' of https://github.com/kguinfo/tesst

Conflicts:
	touroku.php

	new file:   img/background1.png
	modified:   kakunin.php
	modified:   login.html
	deleted:    mysql4.php
	modified:   stylesheet/login.css
	new file:   stylesheet/main.css
	new file:   stylesheet/touroku.css
	new file:   touroku.html
	modified:   touroku.php
	deleted:    touroku1.html
Merge branch 'master' of https://github.com/kguinfo/tesst
change