First commit
Merge https://github.com/karenTran510/AndroidSquare