imported from middlemanatee
Merge branch 'master' of github.com:data-design/rails-guide

Conflicts:
	README.md