Checking merge coolness
Took care of conflict with https://github.com/abcde13/TestAndroid.git
in strings.xml