simple instruction to flow entry options

Signed-off-by:  <>
Merge branch 'master' of https://github.com/jionghuming/openflow_manager

Conflicts:
	flow entry match.txt