commit
Merge branch 'master' into Andrew
Added data file to test on school computers, uses pre-loading because school internet is awful
Merge pull request #20 from stuycs-softdev/Andrew

Andrew