Merge branch 'master' of C:\Users\Silly\AndroidStudioProjects\AnnoyMeNot with conflicts.