Making lifesorter.py more readable
Fixed merge conflicts
Fixed even more merge conflicts