added user log in
Merge branch 'master' of https://github.com/almondbutter/otown
added update