gelöscht
Merge branch 'master' of github.com:butze-mann/arma-ha
merge shit
Merge branch 'master' of github.com:butze-mann/arma-ha
merge
ok
Merge branch 'master' of github.com:butze-mann/arma-ha
vll kaputt
eingerückt
Merge branch 'master' of github.com:butze-mann/arma-ha

Conflicts:
	application/controllers/TaskController.php