bugfixes
pull to push

Merge branch 'develop' of https://github.com/zatricion/NetSim into develop
deleted time attribute from packet
bugfixes
bugfixes

Merge branch 'develop' of https://github.com/zatricion/NetSim into develop
minor changes
fixed event.h
fixed packet event explicit init problem
fixed macro in EventGenerator
added ifndef's
created make_unique and went back to string ids
small fixes
removed handleEvent from Event class
initial work on host PackEvent creation
grabbing updates from develop branch

Merge branch 'develop' of github.com:zatricion/NetSim into feature/HOST

Conflicts:
	CS_143/Host.cpp
Hosts add packetevents upon getting flow v1
pulling develop
pulling develop into router feature
fixing unacknowledged packets issue
Added makefile, basic Test class.