Files done
Files done - 2
Files done - 3
Merge branch 'master' of https://github.com/anishkhale/CS6238.git

Conflicts:
	HardenedPassword/src/calculator/Login.java