QNX proj 6
Merge branch 'master' of https://github.com/mrk3767/swen-461