adding links in the router
merge connie1 branch
remove merge conflict
some small fixes with git stuff
some stuff