Merge branch 'master' of https://github.com/XavierRanger/W4201-Advanced-Data-Analysis

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/XavierRanger/W4201-Advanced-Data-Analysis