revisi
Merge branch 'master' of https://github.com/avew/Tugas-Besar-Grafkom-Kandang-Hamster

Conflicts:
	main.cpp
Merge branch 'master' of https://github.com/avew/Tugas-Besar-Grafkom-Kandang-Hamster
Comment