Completed first assignment
minor improvement of sortcat
Merge conflict
minor improvement to sortcat