#9 my old Part
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/naukma/cauliflower/dao/DAO.java