Barely JR MVP
Merge branch 'master' into danny_stan

Conflicts:
	db/seeds.rb
Merge pull request #6 from jcolomer/danny_stan

Barely JR MVP