tambahan notifikasi controller
Merge branch 'master' of https://github.com/sharonrh/Gamma

Conflicts:
	Project/src/dao/DatabaseHandlerMakanan.java
	Project/src/model/Makanan.java