revised merge issues
rollback
rolling back again
Merge pull request #8 from suhkang/hw5

Hw5