merge
Added Faculty Bios
fix merge issues