# Conflicts:
#   app/build.gradle
#   app/src/main/java/com/virjar/majora/adr/KeepAliveService.java
#   app/src/main/java/com/virjar/majora/adr/MainActivity.java
#   app/src/main/java/com/virjar/majora/adr/Shell.java
#   app/src/main/java/com/virjar/majora/adr/TheApp.java
#   app/src/main/res/layout/activity_main.xml