new file:   .gitignore
	new file:   __init__.py
	new file:   app.py
	new file:   config.py
	new file:   database.db
	new file:   file/database.db
	new file:   file/init.sql
	new file:   fronted/__init__.py
	new file:   fronted/fronted.py
	new file:   model/.model.py.swp
	new file:   model/__init__.py
	new file:   model/db.py
	new file:   model/model.py
	new file:   pageinfo.py
	new file:   readme
	new file:   render/__init__.py
	new file:   render/pageinfo.py
	new file:   render/render.py
	new file:   run.py
	new file:   static/css/footer.css
	new file:   static/css/style.css
	new file:   static/css/tmp.css
	new file:   static/favicon.ico
	new file:   static/images/arrow.gif
	new file:   static/images/bg-body.gif
	new file:   static/images/bg-content.png
	new file:   static/images/bg-footer.gif
	new file:   static/images/bg-menu-selected.gif
	new file:   static/images/bg-nav-left-curve.gif
	new file:   static/images/bg-nav-right-curve.gif
	new file:   static/images/bg-navigation-short.gif
	new file:   static/images/bg-navigation.gif
	new file:   static/images/bg-options.png
	new file:   static/images/bg-sidebar-bottom.gif
	new file:   static/images/bg-text.gif
	new file:   static/images/nothing.png
	new file:   static/images/separator.gif
	new file:   static/js/dic.js
	new file:   static/js/jquery.min.js
	new file:   static/js/script.js
	new file:   static/js/tool.js
	new file:   templates/home.html
	new file:   templates/index.html
	new file:   templates/info/info.html
	new file:   templates/info/notfound.html
	new file:   templates/login.html
	new file:   templates/part/base
	new file:   templates/part/footer
	new file:   templates/part/navigator
	new file:   templates/part/render.html
	new file:   templates/register.html
	new file:   templates/render/createtask.html
	new file:   templates/render/foldername.html
	new file:   templates/render/myfile.html
	new file:   templates/render/mytask.html
	new file:   templates/render/newtask.html
	new file:   templates/render/render.html
	new file:   templates/test.html
	new file:   test.py
	new file:   tool/__init__.py
	new file:   tool/authen.py
	new file:   tool/oss/__init__.py
	new file:   tool/oss/oss_api.py
	new file:   tool/oss/oss_fs.py
	new file:   tool/oss/oss_sample.py
	new file:   tool/oss/oss_util.py
	new file:   tool/oss/oss_xml_handler.py
	new file:   tool/oss/osscmd
	new file:   tool/oss/pkg_info.py
	new file:   tool/oss/test.py
	new file:   tool/oss/test2.py
	new file:   tool/oss/testmyconfig.py
	new file:   tool/osstool.py
	new file:   tool/renderapi.py
	modified:   .gitignore
Merge branch 'master' of github.com:fzlee/cloudrender