added patients controller index and new actions
fixed merge conflicts