code to compute dictionary for CNN features
update to get cNN dict, and some modifications to get new metrics
Merge branch 'master' of github.com:judithabk6/counting_stars

Conflicts:
	code/features/doDictionary.m
	code/main/main.m