Proposal changes
Merge branch 'master' of https://github.com/lauraBaakman/MachineLearning

Conflicts:
	proposal/Proposal.pdf
	proposal/Proposal.tex