primera version de magic companion

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
#
# Initial commit
#
# Changes to be committed:
#   (use "git rm --cached <file>..." to unstage)
#
#	new file:   .directory
#	new file:   .gitignore
#	new file:   .idea/.name
#	new file:   .idea/compiler.xml
#	new file:   .idea/copyright/profiles_settings.xml
#	new file:   .idea/encodings.xml
#	new file:   .idea/gradle.xml
#	new file:   .idea/libraries/ComAndroidSupportAppcompatV71800_aar.xml
#	new file:   .idea/libraries/support_v4_18_0_0.xml
#	new file:   .idea/misc.xml
#	new file:   .idea/modules.xml
#	new file:   .idea/scopes/scope_settings.xml
#	new file:   .idea/vcs.xml
#	new file:   MagicCompanion.iml
#	new file:   MagicCompanion/.gitignore
#	new file:   MagicCompanion/MagicCompanion-MagicCompanion.iml
#	new file:   MagicCompanion/build.gradle
#	new file:   MagicCompanion/proguard-rules.txt
#	new file:   MagicCompanion/src/main/AndroidManifest.xml
#	new file:   MagicCompanion/src/main/ic_launcher-web.png
#	new file:   MagicCompanion/src/main/java/com/magic/magiccompanion/MainActivity.java
#	new file:   MagicCompanion/src/main/res/drawable-hdpi/ic_launcher.png
#	new file:   MagicCompanion/src/main/res/drawable-mdpi/ic_launcher.png
#	new file:   MagicCompanion/src/main/res/drawable-xhdpi/ic_launcher.png
#	new file:   MagicCompanion/src/main/res/drawable-xxhdpi/ic_launcher.png
#	new file:   MagicCompanion/src/main/res/layout/activity_main.xml
#	new file:   MagicCompanion/src/main/res/menu/main.xml
#	new file:   MagicCompanion/src/main/res/values-w820dp/dimens.xml
#	new file:   MagicCompanion/src/main/res/values/dimens.xml
#	new file:   MagicCompanion/src/main/res/values/strings.xml
#	new file:   MagicCompanion/src/main/res/values/styles.xml
#	new file:   build.gradle
#	new file:   gradle.properties
#	new file:   gradle/wrapper/gradle-wrapper.jar
#	new file:   gradle/wrapper/gradle-wrapper.properties
#	new file:   gradlew
#	new file:   gradlew.bat
#	new file:   settings.gradle
#
primera version de magic companion

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
#
# Initial commit
#
# Changes to be committed:
#   (use "git rm --cached <file>..." to unstage)
#
#	new file:   .directory
#	new file:   .gitignore
#	new file:   .idea/.name
#	new file:   .idea/compiler.xml
#	new file:   .idea/copyright/profiles_settings.xml
#	new file:   .idea/encodings.xml
#	new file:   .idea/gradle.xml
#	new file:   .idea/libraries/ComAndroidSupportAppcompatV71800_aar.xml
#	new file:   .idea/libraries/support_v4_18_0_0.xml
#	new file:   .idea/misc.xml
#	new file:   .idea/modules.xml
#	new file:   .idea/scopes/scope_settings.xml
#	new file:   .idea/vcs.xml
#	new file:   MagicCompanion.iml
#	new file:   MagicCompanion/.gitignore
#	new file:   MagicCompanion/MagicCompanion-MagicCompanion.iml
#	new file:   MagicCompanion/build.gradle
#	new file:   MagicCompanion/proguard-rules.txt
#	new file:   MagicCompanion/src/main/AndroidManifest.xml
#	new file:   MagicCompanion/src/main/ic_launcher-web.png
#	new file:   MagicCompanion/src/main/java/com/magic/magiccompanion/MainActivity.java
#	new file:   MagicCompanion/src/main/res/drawable-hdpi/ic_launcher.png
#	new file:   MagicCompanion/src/main/res/drawable-mdpi/ic_launcher.png
#	new file:   MagicCompanion/src/main/res/drawable-xhdpi/ic_launcher.png
#	new file:   MagicCompanion/src/main/res/drawable-xxhdpi/ic_launcher.png
#	new file:   MagicCompanion/src/main/res/layout/activity_main.xml
#	new file:   MagicCompanion/src/main/res/menu/main.xml
#	new file:   MagicCompanion/src/main/res/values-w820dp/dimens.xml
#	new file:   MagicCompanion/src/main/res/values/dimens.xml
#	new file:   MagicCompanion/src/main/res/values/strings.xml
#	new file:   MagicCompanion/src/main/res/values/styles.xml
#	new file:   build.gradle
#	new file:   gradle.properties
#	new file:   gradle/wrapper/gradle-wrapper.jar
#	new file:   gradle/wrapper/gradle-wrapper.properties
#	new file:   gradlew
#	new file:   gradlew.bat
#	new file:   settings.gradle
#
primera version de magic companion

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
#
# Initial commit
#
# Changes to be committed:
#   (use "git rm --cached <file>..." to unstage)
#
#	new file:   .directory
#	new file:   .gitignore
#	new file:   .idea/.name
#	new file:   .idea/compiler.xml
#	new file:   .idea/copyright/profiles_settings.xml
#	new file:   .idea/encodings.xml
#	new file:   .idea/gradle.xml
#	new file:   .idea/libraries/ComAndroidSupportAppcompatV71800_aar.xml
#	new file:   .idea/libraries/support_v4_18_0_0.xml
#	new file:   .idea/misc.xml
#	new file:   .idea/modules.xml
#	new file:   .idea/scopes/scope_settings.xml
#	new file:   .idea/vcs.xml
#	new file:   MagicCompanion.iml
#	new file:   MagicCompanion/.gitignore
#	new file:   MagicCompanion/MagicCompanion-MagicCompanion.iml
#	new file:   MagicCompanion/build.gradle
#	new file:   MagicCompanion/proguard-rules.txt
#	new file:   MagicCompanion/src/main/AndroidManifest.xml
#	new file:   MagicCompanion/src/main/ic_launcher-web.png
#	new file:   MagicCompanion/src/main/java/com/magic/magiccompanion/MainActivity.java
#	new file:   MagicCompanion/src/main/res/drawable-hdpi/ic_launcher.png
#	new file:   MagicCompanion/src/main/res/drawable-mdpi/ic_launcher.png
#	new file:   MagicCompanion/src/main/res/drawable-xhdpi/ic_launcher.png
#	new file:   MagicCompanion/src/main/res/drawable-xxhdpi/ic_launcher.png
#	new file:   MagicCompanion/src/main/res/layout/activity_main.xml
#	new file:   MagicCompanion/src/main/res/menu/main.xml
#	new file:   MagicCompanion/src/main/res/values-w820dp/dimens.xml
#	new file:   MagicCompanion/src/main/res/values/dimens.xml
#	new file:   MagicCompanion/src/main/res/values/strings.xml
#	new file:   MagicCompanion/src/main/res/values/styles.xml
#	new file:   build.gradle
#	new file:   gradle.properties
#	new file:   gradle/wrapper/gradle-wrapper.jar
#	new file:   gradle/wrapper/gradle-wrapper.properties
#	new file:   gradlew
#	new file:   gradlew.bat
#	new file:   settings.gradle
#
Merge remote-tracking branch 'origin/master'