fix
Merge branch 'master' of https://github.com/kitigai/Titeki

Conflicts:
	fdcos.py
	fdcos.pyc
fix