coba yg ini
Merge branch 'master' of https://github.com/rizal76/blogrizal

Conflicts:
	index.php