need to pull for all of the clients
Merge branch 'master' of https://github.com/noahpc/WhiteCollar
need to pull
fixed pull conflicts
worked on help page and also need to pull to test project again
need to pull
fixed pull conflicts
fixed validation and logical problems
fixed pull conflicts