Testing
Merge branch 'master' of https://github.com/jaiabhayk/clip

Conflicts:
	rashmi_features.py

Rashmi features changed