beauty changes
Merge branch 'master' of https://github.com/awesomund/straperate

Conflicts:
	README.md