test & data file for hw3
Merge branch 'hw3' - titus gave us new stuff
part 2 hw 3