# Conflicts:
#	src/main/java/com/itsol/quantrivanphong/access/homepage/controller/NewsController.java
#	src/main/java/com/itsol/quantrivanphong/employee/bussiness/EmployeeBussiness.java
#	src/main/java/com/itsol/quantrivanphong/model/Employee.java
#	src/main/resources/public/index.html