davidjruyle/fifa-madness — pull request #24 by brendancwood (2014-05-07 18:18:48+00:00)
Title: Resolved conflict with origin master

I think this should work, merge and then we can both get back to working with a clean sync.