pulling
Merge branch 'master' of https://github.com/Ryan5231/hood

Conflicts:
	db/migrate/20130613190559_create_votes.rb