Addition of basic global color variables. (See #28)
Basic video background
merged master
Updated database.yml
Updated users_controller.rb because Ross said to.
Merge branch 'master' into base_styles-27-rl
specify ruby 2
Redoing WorkImages as Images, a polymorphic model. #35
Upload/delete via ajax on blog forms. #35

Ditched nested_form for images on blog form in order to create
new images before the blog is created. Associates new images
when the blog is saved. Renders its own templates.
Adding markdown code for images for quick copy/paste. #35
I'm closing this branch because it's kind of old. I'm going to focus on the more specific issues.
Merge pull request #29 from cremalab/base_styles-27-rl

Base styles— including fonts and main layouts. I've changed my class naming convention, so I will add a new issue for that process.
Blog Post Editor Enhancements. #35

- Adding Ace Editor for use in blog posts
- Code fencing and syntax highlighting with highlight.js
- Buttons to insert image code into editor after upload
Featured Images. closes #35.

- Added Featured boolean to Images
- Checkbox to update featured image
- featured_image method on Blog - the most recent featured img
- Blog Header partial that sets featured image as background
Merge branch 'master' into blog-uploads-35-rb

Conflicts:
	app/assets/javascripts/application.js.coffee
Merge pull request #40 from cremalab/blog-uploads-35-rb

Blog Editor
Merge branch 'master' into production

Conflicts:
	app/models/blog.rb
	config/database.yml