testing
Merge branch 'master' of https://github.com/Kelseyfargas/CSCI201FinalProject.git
Merge branch 'master' of
https://github.com/Kelseyfargas/CSCI201FinalProject.git

Conflicts:
	src/gui/LogIn.java