test first
Merge branch 'Facebook-Branch' of https://github.com/LancetRunner/AndroidFun into Facebook-Branch