Implemented methods randomTwoWord and randomThreeWord
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/SecurePasswordGen.java
Fixed formatting and a couple of exceptions