rollbacked the code, testing unsuccessful for bug id 36
Merge branch 'master' of https://github.com/NikhilSama/Giftology