WORKING SCRAPPER THANK GOD
Merge branch 'master' of https://github.com/lmj112/ICHackCATE

Accounting for WinstonLis updates.