master kommit
master kommit 2
master kommit 3
Merge branch 'some_new' into some_new_branch

Conflicts:
	application/controllers/tournament.php
master some
Merge remote-tracking branch 'origin/master' into some_new_branch

Conflicts:
	application/controllers/tournament.php
last one before margin