added one more router fixed some bugs
Merge branch 'master' of https://github.com/Chipman/ourProject