Merge pull request #1 from bassamtiano/master

Minta
Add Gitignore

Add Pelayanan
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	app/config/database.php
	public/assets/controllers/PelayananCtrl.js
Merge branch 'pr/7' into master-1

Conflicts:

app/views/pelayanan/pages/customer_service_informasi_perizinan.blade.php
	public/assets/controllers/PelayananCtrl.js
Merge pull request #8 from bassamtiano/master-1

Master 1