football teams dropdown menu rebuilt
fixing merge conflict in footballs/index.html.erb
Merge branch 'mrwilsondj-master'