Main
Fixed conflict
testing
Merge branch 'master' of https://github.com/bjarkehs/cs_440_mp2.git
Counting variable assignments added