Latest Update
Merge branch 'master' of https://github.com/dapurmedia/bimasco

Conflicts:
	admin/about_us.php
	admin/addContact.php
	admin/addGal.php
	admin/addSosmed.php
	admin/addUser.php
	admin/contact.php
	admin/date_function.php
	admin/editContact.php
	admin/footer.php
	admin/galeri.php
	admin/galeriVid.php
	admin/header.php
	admin/home.php
	admin/manage-user.php
	admin/menu.php
	admin/services.php
	admin/sosmed.php
	connect/connection.php
	css/reset.css
	header.php
	index.php
	js/custom.js
Fix Conflicts 2