new file:   config/.config.php.swo
	new file:   config/config.php
	new file:   config/config.php~
	new file:   config/db.config.php
	new file:   config/dir.config.php
	new file:   config/file.config.php
	new file:   config/mode.config.php
	new file:   config/module.config.php
	new file:   config/session.config.php
	new file:   config/url.config.php
	new file:   include/function/memory.fun.php
	new file:   index.php
	new file:   log.txt
	new file:   plugin/homepage/home.view.php
	new file:   plugin/homepage/homepage.control.php
	new file:   plugin/homepage/homepage.model.php
	new file:   plugin/login/login.control.php
	new file:   plugin/login/login.model.php
	new file:   plugin/login/login.view.php
	new file:   plugin/login/template/login/login.css
	new file:   plugin/login/template/login/login.htm
	new file:   plugin/login/template/login/login.js
	new file:   plugin/login/template/login/md5.js
	new file:   plugin/register/register.control.php
	new file:   plugin/register/register.model.php
	new file:   plugin/register/register.view.php
	new file:   plugin/register/template/first/first.htm
	new file:   plugin/register/template/first/page.css
	new file:   plugin/register/template/first/page.js
	new file:   plugin/register/template/second/second.htm
	new file:   plugin/register/template/secondtttt/jQuery-ui.css
	new file:   plugin/register/template/secondtttt/jQuery-ui.js
	new file:   plugin/register/template/secondtttt/page.css
	new file:   plugin/register/template/secondtttt/page.js
	new file:   plugin/register/template/secondtttt/range.js~
	new file:   plugin/register/template/secondtttt/second.htm
	new file:   plugin/register/template/secondtttt/slider.js
	new file:   plugin/register/template/secondtttt/slider.js~
	new file:   plugin/register/template/secondtttt/time.js~
	new file:   plugin/register/template/third/page.css
	new file:   plugin/register/template/third/page.js
	new file:   plugin/register/template/third/third.htm
	new file:   plugin/register/template/third/third.htm~
	new file:   style/css/base.css
	new file:   style/css/base.css~
	new file:   style/js/base.js
	new file:   style/js/jQuery-ui.js~
	new file:   style/js/jQuery.js
	new file:   style/js/jQuery.js~
	new file:   system/.index.system.php.swm
	new file:   system/base/boot.base.php~
	new file:   system/base/cache.base.php
	new file:   system/base/cache.base.php~
	new file:   system/base/db.base.php
	new file:   system/base/encode.base.php
	new file:   system/base/execute.base.php
	new file:   system/base/guider.base.php
	new file:   system/base/hook.base.php
	new file:   system/base/integrate.base.php
	new file:   system/base/language.base.php
	new file:   system/base/load.base.php
	new file:   system/base/modelverify.base.php
	new file:   system/base/module.base.php
	new file:   system/base/plugin.base.php
	new file:   system/base/process.base.php
	new file:   system/base/session.base.php
	new file:   system/base/url.base.php
	new file:   system/base/user.base.php
	new file:   system/base/variables.base.php
	new file:   system/boot/base.boot.php
	new file:   system/boot/base.boot.php~
	new file:   system/boot/config.boot.php
	new file:   system/boot/core.boot.php
	new file:   system/boot/lib.boot.php
	new file:   system/boot/lib.boot.php~
	new file:   system/config/constants.config.php
	new file:   system/config/db.config.php
	new file:   system/config/dir.config.php
	new file:   system/config/file.config.php
	new file:   system/config/sys.config.php
	new file:   system/core/.style.core.php.swp
	new file:   system/core/config.core.php
	new file:   system/core/load.core.php
	new file:   system/core/style.core.php
	new file:   system/core/variables.core.php
	new file:   system/index.system.php
	new file:   system/lib/boot.lib.php
	new file:   system/lib/control.lib.php
	new file:   system/lib/index.lib.php
	new file:   system/lib/model.lib.php
	new file:   system/lib/model.lib.php~
	new file:   system/lib/singleton.lib.php
	new file:   system/lib/view.lib.php
	new file:   template/front.htm
	new file:   template/rear.htm
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
Merge https://github.com/wfirewood/teampage