Fixed duplicate variables and miscellaneous text introduced from
previous merge.
Merge branch 'master' of https://github.com/dasteve101/elec5614