start ourApproach
Merge branch 'master' of https://github.com/Dustland/QoS

This reverts commit 94ccc549417d73a23751381e1f4522cc21c97d3d.

Conflicts:
	ourApproach/table.cpp