Remove class files
Test
Fix
Adding Garret's changes.
Merge branch 'goldani-master'
Merge pull request #6 from william-alexander/master

Pointless request
Finished merging changes