Fixin' last commit's bullshit
Merge branch 'MerlinTester' of github.com:Strauser/checkQuotivalUpdate into MerlinTester
Fixin' ignored tests..