merged Connor/Ben on newform.html
merged lookup page with Connor/Ben