fixed compile errors
Merge branch 'master' of github.com:Tadimsky/CS356-Lab-2--Router