resolve merge conflicts
Merge branch 'file_system' of https://github.com/tadas412/PennOS into file_system
add whence constants