Rename string to ring
Merge branch 'master' of https://github.com/DevYah/git_session

Conflicts:
	word_freq.py