Logger
Merge branch 'master' of https://github.com/zixuanl/Task1

Conflicts:
	.gitignore