database shit
wtf

Conflicts:
AjaxAgendaApp/SelectPlayersViewController.m
go for it