Merge branch 'OptionsScreen'

Conflicts:
RiskyBusinessProject/RiskyBusiness/src/main/AndroidManifest.xml

RiskyBusinessProject/RiskyBusiness/src/main/java/com/slothproductions/ri
skybusiness/view/BoardScreenMainFragment.java

RiskyBusinessProject/RiskyBusiness/src/main/java/com/slothproductions/ri
skybusiness/view/MainMenuScreen.java

RiskyBusinessProject/RiskyBusiness/src/main/java/com/slothproductions/ri
skybusiness/view/OptionsScreen.java
RiskyBusinessProject/RiskyBusiness/src/main/res/values/strings.xml
RiskyBusinessProject/RiskyBusinessProject.iml