design implemented
conflicts merged
Merge pull request #39 from emocentmagar/lambu

Lambu