included all import statements and rewrote the classes so they work with each other.
Merge pull request #30 from mchen14/master

included all import statements