Copy Edited
Merge branch 'master' of https://github.com/docka/tastyplanet