User login no longer overrides current users
Merge branch 'master' of https://github.com/HubertChen/FlashCards

Conflicts:
	src/main/java/controllers/Main.java