working
Merge branch 'master' of github.com:bartsnapp/gates

Conflicts:
	application/proposalNarrative.tex