update README.
Merge branch 'master' of https://github.com/floodlight/floodlight

Conflicts:
	README.txt
Merge pull request #386 from kwanggithub/master

update README.