add cheatsheet
Merge remote-tracking branch 'origin/master'

Conflicts:
	Proposal/proposal.pdf