editted out merge conflicts
Merge pull request #9 from leeju/eric

editted out merge conflicts