to re-merge with Aaron
merge conflict resolution with Aaron
added facilities back in
sync to ShareLaTex 9/9/13 8:55am
updated budget_justification - keeping all institutional content
added budget_just_ucb.tex for Berkeley justification and first-pass update of team member roles
Wrote a first draft project summary
Added in figures from sharelatex that weren't already committed.
Merge branch 'master' of https://github.com/david-deboer/strawman

Conflicts:
	msip_pre/plots/HERA_z8_SNR_annotated_v2.jpg
	msip_pre/plots/Xray.pdf
	msip_pre/plots/hera_snr_contour.png