resize figures, removed some text
Fixed merge conflicts
Merge branch 'master' of https://github.com/trivoldus28/switchless-sim