Renamed programming-tournament to tournament
Merge pull request #45 from AndrewBrinker/master

Renamed programming-tournament to tournament