Merge branch 'addSortingFunctionality'

Conflicts:
	game_of_thrones/main.py