finished index and merged oskar's team page