changed parameters, saved the day
deleted old useless stuff
Merge branch 'master' of https://github.com/marc-a/ECSE526-Project