Merge branch 'master' of /home/ajit/AndroidStudioProjects/GermanVocab with conflicts.
new dictionary, flip working