Thanks again
Merge branch 'master' of ssh://git@github.com/jacobkranz/eclipse.git

Conflicts:
	src/password/ForgotPassword.java
Add code for the start of the UI