essage to explain why this merge is necessary,
Merge branch 'master' of http://github.com/timothy-pratama/Tugas-Besar

Conflicts:
	main2.cpp

/bin/bash: indent: command not found
/bin/bash: indent: command not found
Merge branch 'master' of https://github.com/timothy-pratama/Tugas-Besar

Conflicts:
	main2.cpp