changes
Merge branch 'master' of https://github.com/davidwan/wth-home

Conflicts:
	home/templates/index.html