merged with alfonso's additions
Merge branch 'master' of github.com:kedorlaomer/ta-final

Conflicts:
	features.py