more styling
resolved conflicts in user index.html
Merge pull request #23 from paulhyunkim/stylebranch

Stylebranch