[TEST-123] Changing things around
http://TEST-123
Merge branch 'master' of https://github.com/carlospatinos/kFriendsClub.git