Added button functionality, repaired broken code
fixing code conflicts
still working on push fix
fixing code conflicts
Merge branch 'master' of https://github.com/RICJ2/CJ2.git

Conflicts:
	NetBeansProjects/LoginScreen/src/loginscreen/EditAccount.java