Add KategoriDaoDemo.java
Resolve conflicts