deleted:    .gitignore
	modified:   dx2_to_xn2_release.php
	modified:   ../view/test.htm
	../control/test_control.class.php
	modified:   dx2_to_xn2_release.php
	modified:   dx2_to_xn2_release.php
Merge branch 'master' of github.com:xiuno/xiunobbs