working on info page
Merge branch 'master' of https://github.com/nasty-nick/t.leaf

Conflicts:
	info.html