commiting before overwrite
resolving merge conflicts
Merge pull request #38 from paulhyunkim/stylebranch

Stylebranch