fixed variable naming issue, added tests
fixed variable naming issue, added tests
cleaned up code a bit
Merge branch 'master' of https://github.com/ibanishapurr/project3