Changed sort to asynchronous

Signed-off-by: Byron Maroney <bmaroney@ualberta.ca>
Merge branch 'master' of github.com:CMPUT301F14T09/Team09Project