benerin yang tadi hilang
Merge branch 'master' of https://github.com/sharonrh/SIOUI

Conflicts:
	nbproject/project.properties
	src/java/model/PelamarModel.java
wooy