manoj2589/Team-B — pull request #2 by krishnagit (2014-11-18 10:16:00+00:00)
Title: resolved coflicts

@manoj2589 @esmpriya look at the conflicts resolved..