Fixed projects stuff
fixed merge changes
Merge branch 'master' of https://github.com/noahpc/WhiteCollar