Fixed FFs, added data sorting

Fixed feature function loop.  Added data sorting to Collins.
Merge branch 'experimental'
Merge branch 'master' of https://github.com/deba2000/CS250B