Merge branch 'master' of /Users/Kaaninan/AndroidStudioProjects/Sifrele with conflicts.
tasarım a1.1