Merge Add Ingredients Activity

Should be a fairly decent demo after this.