git add AndroidManifest.xml
git add activity_ftips.xml
git add FTipsListActivity.java
git commit -m 'yes'
Barry merge fix
Revamped FTips to be a Master/Detail Activity.