Updated android manifest to include audrey's activities and updated audrey's activities package to com.stanford.tutti.
Merged src and renamed audrey's package stuff.
Merged my res/layout into audrey's
updated res/menu
updated strings.xml to remove duplicates and concatenate.
updated main activity and main activity jay to fix build warnings.
updated gitignore for linter.