Added gitignore and some small changes
Broke the sorter out to a separate class, some changes here and there.