Creating template
working on database
submitting and listing is working
conflicts resolved
removed diff line
added some styling and some refinements for submission