app/views.py
Merge branch 'master' of https://github.com/lbiester/Learn-Chinese

Conflicts:
	app/views.py