updated readme, tests
Merge branch 'master' of https://github.com/bentona/sweatpants

Conflicts:
	README.md