modified:   agenda.org
Merge branch 'master' of https://github.com/abelardojarab/Documents

Conflicts:
	agenda.pdf
	agenda.tex

	modified:   PSU/Proposal_June_14_2013.tex