added user login
user login working
finished users
added count of week's entries
add a v
merge conflicts resolved