U. of Houston sit-in ends as teaching fellows are promised $1M