master kommit
master kommit 2
Merge remote-tracking branch 'origin/master' into some_new_branch

Conflicts:
	application/controllers/tournament.php