merging to have most updated version; only 2 tests passing still (question#index)