merging
Merge branch 'master' of https://github.com/timothy-pratama/Tugas-Besar

Conflicts:
	main2.cpp