Merged 2 samples under EricHuang2 directory

Merged the existing two samples into one under the folder "mergeSample"
    - Merged classes Song, ElectricGuitar, Life, Dog
    - Merged the respective test for each class
    - added build.xml