pull

updated the new user, still working on db problem