fix bug with sorting
merge
Merge branch 'master' of https://github.com/d0ntth1nc/Team-SEAWORLD