initail commit
Merge branch 'master' of github.com:www40/Floodit

Conflicts:
	README.md
Merge branch 'master' of github.com:www40/Floodit

Conflicts:
	README.md