login updates
writing to a text file
updated login
update
update
Merge origin/master

Conflicts:
	build/classes/pkg3710/project2/NewJFrame$1.class
	build/classes/pkg3710/project2/NewJFrame$2.class
	build/classes/pkg3710/project2/NewJFrame$3.class
	build/classes/pkg3710/project2/NewJFrame$4.class
	build/classes/pkg3710/project2/NewJFrame.class