update index
changes homepage to daily
merge conflicts
fixed merge conflict