merging
Merge branch 'GossipObserver' of https://github.com/VWJF/eece411P2.git into GossipObserver