Fixed some of the messages, still working, just committing
Merge branch 'master' of https://github.com/cman131/ConcurrentProject2