before merge of documents
added gitignore file
Merge branch 'master' of github.com:sniqer/masterthesis

Conflicts:
	.gitignore
modified planeringsrapport
Merge branch 'master' of github.com:sniqer/masterthesis