checkout updates from master; add css to index.html