added opt.pmg
cropped
Merge branch 'master' of github.com:thearn/mao_cadre_2014
first bits of the cadre results section
more on the results section
uncommented package import
added colorbar to images
fixed merge conflict
fixed a few typos
more data explaination
Merge branch 'master' of github.com:JustinSGray/mao_cadre_2014

Conflicts:
	graph_framework.tex
Merge pull request #3 from thearn/master

Started CADRE results section