pins
Merge https://github.com/twuster/rails-final-project

Conflicts:
	db/schema.rb