1st verison
Merge https://github.com/migueLoureiro/AndroidProject