update
update this file won't let me sync unless this is

done
Merge branch 'HEAD' of https://github.com/RICJ2/CJ2.git

Conflicts:
	NetBeansProjects/LoginScreen/nbproject/private/private.properties
	NetBeansProjects/LoginScreen/nbproject/private/private.xml