Commits are so messed up, not even going to give a reason for this one
:S
Merge branch 'master' of https://github.com/Taeir/OzoneSports.git