teste
teste2
add os_pagefault function
merging with master
Merge branch 'guilherme'
moved test files to tst/
added functions to manipulate the disk
added functions to manipulate the disk
change checkBits to static
conflict resolved.