Options menu done
Fixed Conflicts
Now using strings.xml
Fixed conflicts in strings.xml and PomometerTimerActivity.java