last commit of the night

updated the new user, still working on db problem
Merge pull request #3 from jchild/master

pull