Merge branch 'master' of C:\Users\krishnakumar\AndroidStudioProjects\PLU with conflicts.
ll