Test commit
Merge remote-tracking branch 'origin/neykho-Diablo3Armory'

Conflicts:
	Diablo 3 Armory/src/main/java/com/protegra/diablo3armory/MainActivity.java
Merge remote-tracking branch 'origin/neykho-Diablo3Armory'

Conflicts:
	Diablo 3 Armory/src/main/java/com/protegra/diablo3armory/MainActivity.java
Revert "Merge remote-tracking branch 'origin/neykho-Diablo3Armory'"

This reverts commit 0d85737d15963101f9a8c0a64da8533efa685d3a.
update gitignore
Merge branch 'master' of https://github.com/aveyD/Diablo3Armory

Conflicts:
	Diablo 3
Armory/src/main/java/com/protegra/diablo3armory/MainActivity.java