Merge branch 'master' of https://github.com/SimonTakman/TDA367

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/SimonTakman/TDA367

Conflicts:
	.gitignore