updating pre-pull
fixed conflicts
added new form field for website and completed ejs for report page