lusi push lagi
Merge remote-tracking branch 'origin/master'

Conflicts:
	V1Lomba/connect.php
	V1Lomba/editprofile.php
	V1Lomba/favorite.php
	V1Lomba/login.php
	V1Lomba/other.php
	V1Lomba/post.php
tambah api