changed token in userservice
solve conflict by keeping theirs
new front end to be added tonight
login and first page

trying to push first page and login
another merge