fuck the old commit, here's the fixed version

Signed-off-by: FNox <kamaitama@gmail.com>
yeh

Signed-off-by: FNox <kamaitama@gmail.com>
Merge branch 'master' of github.com:kamaitama/Tiramisu

Conflicts:
	readme.txt