file name fix
Merge branch 'master' into UCSD
Added favicon