f
1
sort & func completed
Merge branch 'master' of https://github.com/amytis/RBPT.git

Conflicts:
	src/Sort.class
1