Added project document and got password change to work
Fixed merge errors