commit minor formatting changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Password Validator/src/password/validator/PasswordValidator.java
	Password Validator/test/password/validator/PasswordValidatorTest.java
committing some pending local changes and fixing broken test