rename
tamagochi task
Merge https://github.com/xandrck/RoR-GeekHub-Ruby-basics

Conflicts: