sadf
Merge branch 'master' of https://github.com/hlopez88/draft_party

Conflicts:
	config/routes.rb