second commit
third commit
Merge branch 'master' of https://github.com/jeffjhsu/fuzzy-robot

Conflicts:
	README.md
third commit