desain dimana-mana
Merge branch 'master' of https://github.com/gentaiscool/IF3110-Tubes-I
update lagi
Merge branch 'master' of https://github.com/gentaiscool/IF3110-Tubes-I
update
Merge branch 'master' of https://github.com/gentaiscool/IF3110-Tubes-I

Conflicts:
	css/homepage.css
Merge branch 'master' of https://github.com/gentaiscool/IF3110-Tubes-I
Merge branch 'master' of https://github.com/gentaiscool/IF3110-Tubes-I

Conflicts:
	pages/list.php