class helpers

Conflicts:
	index.php