Merge branch 'master' of C:\Users\VIO\AndroidStudioProjects\chrisevatt with conflicts.