preparing to merge
merged
changed user_id to author in posts
mailer working again
merged