local
Merge branch 'master' of https://github.com/ichlasul/ManOverflow

Conflicts:
	application/views/karyawan/daftarkaryawan_view.php
Merge branch 'master' of https://github.com/ichlasul/ManOverflow
tambahin prototip untuk jadwal
update gitignore