Merge branch 'master' of https://github.com/bhooshiar/SimpleFlashCards

Conflicts:
	res/layout/activity_create_new_flash_cards.xml
	res/values/strings.xml
	src/com/example/simpleflashcards/CreateNewFlashCards.java