Pulled changes from master
accidentally deleted a method to resolve a conflict. Reverted the change
Merge branch 'master' of https://github.com/rellermeyer/course_os into loader
Worked on the memory_allocation part of the loader will work on it more tonight
merge loader