do a more general search for parameters and constructibles
Merge branch 'master' of https://github.com/pankajprateek/Solving-Geometry-Problems--CS498-

Conflicts:
	interpreter/interpret
	interpreter/interpreter.o
	interpreter/mapper.cpp
	interpreter/mapper.o