Started link state packet stuff
Fixed merge conflict
Merge branch 'master' of github.com:jracoma/cs352proxy-1