changes to i3, added tester script to allow changing main variables
Merge branch 'master' of https://github.com/lindsey-andrade/linearity2project1