Merge branch 'master' of C:\Users\My_Computer\AndroidStudioProjects\MyApplication5 with conflicts.