Initial commit of proposal
Merge branch 'master' of https://github.com/jritter/MasterThesisProposal

Conflicts:
	.gitignore