Make Whatever more friendly

Conflicts:
	whatever
Update README
Merge pull request #14 from isolrac/master

Make Whatever more friendly