some stuff added... needs to me made into threads
Merge branch 'master' of https://github.com:443/pauloaguiar91/Assignment3.git