create scaffold for comments
contact form posts to database
contact form server side validation
generate contact_mailer
fix merge conflicts and merge