nothing
Merge branch 'master' of git://github.com/tclh123/kido

Conflicts:
	diy/application/views/index.py
"":Merge branch 'master' of git://github.com/tclh123/kido

Conflicts:
	diy/application/views/index.py
Merge branch 'master' of git://github.com/tclh123/kido
Merge branch 'master' of git://github.com/tclh123/kido
theam
Merge branch 'master' of git://github.com/tclh123/kido
add *~ to .gitignore