fixed pushup activity, modified text of workouts, added calorien input