update kamis
Merge branch 'master' of https://github.com/khairaniummah/II3160-18211003-18211050

Conflicts:
	index.php