MERGING
Simon added .class files dat newb
Transfering files so Dan can use them