Merge pull request #6 from ryantroyford/nebraska

Nebraska
Update 2013-12-01-california.md

grammar fix
Update info.html

adding ty deal to buddy roster
fixing conflicts before merge