styleing
merge conflicts
Final changes to bios
fixed merge conflicts
deleted file