fixed tove
Merge branch 'master' of github.com:nyson/honour

Conflicts:
	index.php