Merge branch 'master' of C:\Users\AFA\Android Studio Projects\EndGame with conflicts.
Added dialog activity and fragment