Incorporated changes from CG
Merge branch 'master' of https://github.com/NicolasatHertie/FirstAssignment

Conflicts:
	.Rhistory