Added the options layout
Idk
Merge branch 'master' of https://github.com/jeffcirka/Lyra.git

Conflicts:
	eartrainer/res/values/strings.xml
	eartrainer/src/main/java/com/lyra/eartrainer/HelloAndroidActivity.java