first commit wthome
second commit
Merge branch 'master' of https://github.com/davidwan/wth-home

Conflicts:
	manage.py
	venv/bin/easy_install
	venv/bin/easy_install-2.7
	venv/bin/pip
	venv/bin/pip2
	venv/bin/pip2.7
	venv/bin/python
	venv/bin/python2
	venv/bin/python2.7