featured images, s3, javascript, css, categories, form validation, routes
merge conflicts
centering titles
Merge branch 'master' of heroku.com:dailydeed

merging jons latest changes