Merge branch 'master' of https://github.com/RWTH-OS/eduOS
fixes wrong return value of page_map(), fixes #2y
Merge branch 'master' of github.com:stv0g/eduOS