Merge pull request #2 from bassamtiano/master-1

Master 1
Rekapitulasi Pendaftaran(tanggal+cetak)

Fungsi tanggal & Cetak fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/assets/controllers/PelayananCtrl.js
Git Ignore

Add Git Ignore
Ajaib

Ajaib