aku ngedit
Merge branch 'master' of https://github.com/igrir/Myschedule

Conflicts:
	catatan.txt