merge
Merge branch 'master' of https://github.com/meizhitu/100programhomework

Conflicts:
	100-26-literal-11.py
	BeautifulSoup.py