finish list1.py
finish list2.py
readme file
Merge branch 'master' of github.com:OldPotOnline/PythonPractice
string1 and wordcount
Merge branch 'master' of github.com:edguo/python-practice

Conflicts:
	google-python-exercises/basic/wordcount.py