FINAL COMMIT PRIOR TO PRESENTATION
Merge branch 'master' of https://github.com/lmj112/ICHackCATE

Getting winstonlis update