monday's code 1
Merge branch 'master' of https://github.com/franklingu/EE2024-project

Conflicts:
	main.c