adds home button
merges conflicts
Merge branch 'texting'