Update Makefile and add CONDA variable#70

wbashir wants to merge 1 commit intohackalog:masterhackalog/bus_number:masterfrom

wbashir:masterwbashir/bus_number:masterCopy head branch name to clipboard