deleted:    playVLAN.py
	deleted:    simple_switch.py
	deleted:    vlan_switching.py
	new file:   remark.py
Starting metering development
	modified:   remark.py
	modified:   remark.py
Meter added to the switch
	modified:   remark.py
	modified:   remark.py
       Added tables.py
	renamed:    vlan_switching.py -> app/vlan_switching.py
	deleted:    playVLAN.py
	deleted:    simple_switch.py
	new file:   app/remark.py
	new file:   app/tables.py
	modified:   run.sh
Merge branch 'tables'

Conflicts:
	app/vlan_switching.py
	run.sh

	modified:   run.sh