03/24/2014
Merge branch 'master' of https://github.com/skoshti/HT

Conflicts:
	README.md