nothing to commit
add students controller and index action
remove conflicts