Merge branch 'master' of https://github.com/atertel/OS-Project

Conflicts:
shadowParseTest.c
sync test