Functions v 0.3

Functions galore
test cases v6

none
Merge remote-tracking branch 'origin/master'

Conflicts:
	api/test.php