stuff with threading. just deal with it. wiiith phil. for the record. for the techno.
Merge branch 'master' of https://github.com/justia02/PSI-team-3