added missing files to compile CRISP
Merge branch 'master' of https://github.com/vibansal/crisp

Conflicts:
	common.h
	crisp/crispcaller.h
deleted files

Merge branch 'master' of https://github.com/vibansal/crisp

Conflicts:
	common.h
	crisp/crispcaller.h