Merge pull request #69 from littlpunk/master

pulling
Merge pull request #21 from ZooTypers/master

Pull
Changing up old tests and adding new tests.
Merge pull request #75 from dyxliang/master

Pull
Tested all of the classes and reached 50%+ coverage!
Merge pull request #76 from dyxliang/master

Pull update.
Commenting out some test method for jenkins.
Merge pull request #77 from dyxliang/master

Pull update.
Merge pull request #1 from ZooTypers/master

pull