Should sort correctly now
Merge branch 'master' of github.com:jrile/cs480