want to play with sorting lists - therefore cleaning up
merge conflict resolved
Merge branch 'master' of github.com:krtonga/lineitup