Merge branch 'master-1'
Merge pull request #8 from bassamtiano/master-1

Master 1
Merge branch 'master-1'
Remove Conflict at database.php PelayananCtrl.js

Remove <<<< HEAD
Merge branch 'master' of https://github.com/bassamtiano/sicantik-backoffice
Create Reporting

Template for Reporting
Git Ignore

Add Git Ignore
Yucks

Commit Gajelas
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/database.php
	public/assets/controllers/PelayananCtrl.js
konfigurasi/setting-wilayah

kurang function save. on progress
Ajaib

Ajaib
Merge pull request #9 from almerps/master

Add print function in reporting
Push Conflict

Push File conflict after merge disapeared
Another Push Conflict

Interesting Update
CRUD Backoffice Push 1

Entry Perizinan
Setting Wilayah semuanya

Modul Setting Wilayah R
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/database.php
Synch Test

cant merge to master
Hendra Ganteng

Hendra tuh ganteng banget
Backoffice Penjadwalan Tinjauan

Add Edit function but need angular function