adding john miller
updating John Miller
John Miller update
merge